From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 25 Jun 2015 17:50:38 +0000 (-0400)
Subject: Merge 3.5 (issue #24509)
X-Git-Tag: v3.6.0a1~2042
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52c6d599f5fbd7fa9292a796677f2f8ab4eadea3;p=python

Merge 3.5 (issue #24509)
---

52c6d599f5fbd7fa9292a796677f2f8ab4eadea3