From: Yury Selivanov <yury@magic.io>
Date: Thu, 8 Dec 2016 00:20:10 +0000 (-0800)
Subject: Merge 3.6 (issue #28635)
X-Git-Tag: v3.7.0a1~1815
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee19ab59628530407f9b1dfc9a7e5b62c12febed;p=python

Merge 3.6 (issue #28635)
---

ee19ab59628530407f9b1dfc9a7e5b62c12febed