From: Yury Selivanov <yury@magic.io>
Date: Thu, 10 Nov 2016 20:39:46 +0000 (-0500)
Subject: Merge 3.6 (issue #28635)
X-Git-Tag: v3.7.0a1~2013
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7255edd3df1ff5a69700089db40fedf997788c0a;p=python

Merge 3.6 (issue #28635)
---

7255edd3df1ff5a69700089db40fedf997788c0a