From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 23 Jul 2015 05:55:07 +0000 (+0300)
Subject: Merge 3.5 (Issue #24688)
X-Git-Tag: v3.6.0a1~1929
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b7a2445d9cce22608a053a959c7ff13e91f4cfb;p=python

Merge 3.5 (Issue #24688)
---

9b7a2445d9cce22608a053a959c7ff13e91f4cfb