From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 24 Jun 2015 16:51:55 +0000 (-0400)
Subject: Merge 3.5 (issue #24325 & #24400)
X-Git-Tag: v3.6.0a1~2045
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2cb6b7a7ff4cb8336c8b0af483f52ccf1b46202c;p=python

Merge 3.5 (issue #24325 & #24400)
---

2cb6b7a7ff4cb8336c8b0af483f52ccf1b46202c