From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 23 Jul 2015 12:58:57 +0000 (+0300)
Subject: Merge 3.5 (Issue #24692)
X-Git-Tag: v3.6.0a1~1925
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56786c9ea27efb30320f89d663dbff74f5a5e014;p=python

Merge 3.5 (Issue #24692)
---

56786c9ea27efb30320f89d663dbff74f5a5e014