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

Merge 3.6 (issue #28003)
---

9a2ffbd47cf32f228384d80e07e340f80a31a768