From: Yury Selivanov <yury@magic.io>
Date: Wed, 9 Nov 2016 00:59:57 +0000 (-0500)
Subject: Merge 3.6 (issue #28639)
X-Git-Tag: v3.7.0a1~2027
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6cb819c171d8511651ed8c0cb82130e841b5dde7;p=python

Merge 3.6 (issue #28639)
---

6cb819c171d8511651ed8c0cb82130e841b5dde7