From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 2 Mar 2016 16:17:18 +0000 (-0500)
Subject: Merge 3.5 (issue #26338)
X-Git-Tag: v3.6.0a1~537
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5604446b3b0b127755aa93f13c49830eba43285d;p=python

Merge 3.5 (issue #26338)
---

5604446b3b0b127755aa93f13c49830eba43285d