From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 30 Jun 2015 16:49:18 +0000 (-0400)
Subject: Merge 3.5 (Issue #24528)
X-Git-Tag: v3.6.0a1~2029
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bd2b98c29c1cdc75fd093eb48b3517f1295b50e;p=python

Merge 3.5 (Issue #24528)
---

3bd2b98c29c1cdc75fd093eb48b3517f1295b50e