From: Yury Selivanov <yselivanov@sprymix.com>
Date: Sun, 9 Aug 2015 22:21:58 +0000 (-0400)
Subject: Merge 3.4 (issues #24835, #24763)
X-Git-Tag: v3.6.0a1~1803^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=131426ebe34f7781c3ab1e213ed4f521bf7cc2e0;p=python

Merge 3.4 (issues #24835, #24763)
---

131426ebe34f7781c3ab1e213ed4f521bf7cc2e0