From: Yury Selivanov <yselivanov@sprymix.com>
Date: Fri, 3 Jul 2015 04:24:14 +0000 (-0400)
Subject: Merge 3.5 (Issue #24450)
X-Git-Tag: v3.6.0a1~2012
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6d0b5b1fa5cb0b4c8645e3446189b348dcf344c;p=python

Merge 3.5 (Issue #24450)
---

d6d0b5b1fa5cb0b4c8645e3446189b348dcf344c