From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 5 Aug 2015 21:55:12 +0000 (-0400)
Subject: Merge 3.5 (issue #24791)
X-Git-Tag: v3.6.0a1~1828
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dca249b17c3db2327a89d683f1059b7ed787417e;p=python

Merge 3.5 (issue #24791)
---

dca249b17c3db2327a89d683f1059b7ed787417e