From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 25 Jun 2015 17:50:21 +0000 (-0400)
Subject: Merge 3.4 (issue #24509)
X-Git-Tag: v3.5.0b3~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e79f3557cc82f54e9b6b95143b4619b9ad33dccc;p=python

Merge 3.4 (issue #24509)
---

e79f3557cc82f54e9b6b95143b4619b9ad33dccc