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

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

31978d9ff4c91f91fa26ec7909ee3b26e1b08e67