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

Merge 3.5 (Issue #24400)
---

93a3252c9c656c095e6855e48c1d05eda141be09