From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 24 Jun 2015 15:04:39 +0000 (-0400)
Subject: Merge 3.5 (issue #24439)
X-Git-Tag: v3.6.0a1~2047
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b257b7993c351f17a28f5846fb26fa6480d75fbc;p=python

Merge 3.5 (issue #24439)
---

b257b7993c351f17a28f5846fb26fa6480d75fbc