From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 18 Aug 2015 18:23:02 +0000 (-0400)
Subject: Merge 3.5 (issue #23572)
X-Git-Tag: v3.6.0a1~1759
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aae9a1d7897ebe8786a18cdb5cae4ad5976a8d36;p=python

Merge 3.5 (issue #23572)
---

aae9a1d7897ebe8786a18cdb5cae4ad5976a8d36