From: Yury Selivanov <yury@magic.io>
Date: Thu, 15 Dec 2016 22:57:55 +0000 (-0500)
Subject: Merge 3.6 (issue #28635)
X-Git-Tag: v3.7.0a1~1741
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=583644b74283a6611c48f07623b924ef730492ba;p=python

Merge 3.6 (issue #28635)
---

583644b74283a6611c48f07623b924ef730492ba