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

Merge 3.5 (Issue #24619)
---

38d3876bfbeef65ec8ddc81cd88c739e6e8c3699