From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 1 Jul 2015 02:13:56 +0000 (-0400)
Subject: Merge 3.5 (Issue #24487)
X-Git-Tag: v3.6.0a1~2022
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=deca7d515adb87c5cfee7a4704d0712e3f048c24;p=python

Merge 3.5 (Issue #24487)
---

deca7d515adb87c5cfee7a4704d0712e3f048c24