From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 1 Jul 2015 16:49:17 +0000 (-0400)
Subject: Merge 3.5 (issue #24400)
X-Git-Tag: v3.6.0a1~2019
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7982beca93c3f214a58ec423611e0e911c3ef83;p=python

Merge 3.5 (issue #24400)
---

d7982beca93c3f214a58ec423611e0e911c3ef83