From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 10 Sep 2015 22:27:17 +0000 (-0400)
Subject: Merge 3.5 (issue #22980, whatsnew/3.5)
X-Git-Tag: v3.6.0a1~1596
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbfee5a1714859f1b67f812b077c4395e4c2b572;p=python

Merge 3.5 (issue #22980, whatsnew/3.5)
---

cbfee5a1714859f1b67f812b077c4395e4c2b572