From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 23 Jul 2015 06:11:13 +0000 (+0300)
Subject: Merge 3.5 (Issue #24687)
X-Git-Tag: v3.6.0a1~1928
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d35043e4960717dfbdafc55493286f5eafe5b9a;p=python

Merge 3.5 (Issue #24687)
---

6d35043e4960717dfbdafc55493286f5eafe5b9a