From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 22 Jul 2015 10:38:18 +0000 (+0300)
Subject: Merge 3.5 (Issue #24619)
X-Git-Tag: v3.6.0a1~1937
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f1701a1fb45743a97205375e0e209c1d6bb6587;p=python

Merge 3.5 (Issue #24619)
---

3f1701a1fb45743a97205375e0e209c1d6bb6587