From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 2 Sep 2015 19:50:04 +0000 (-0400)
Subject: Merge 3.5 (issue #24975)
X-Git-Tag: v3.6.0a1~1701
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1fa3652e59b5060d9c17671b24f8f92ec2a85326;p=python

Merge 3.5 (issue #24975)
---

1fa3652e59b5060d9c17671b24f8f92ec2a85326