From: Yury Selivanov <yury@magic.io>
Date: Mon, 14 Nov 2016 19:49:38 +0000 (-0500)
Subject: Merge 3.6 (issue #28635)
X-Git-Tag: v3.7.0a1~1989
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63e6a7c3f4b72db95fff8fdac60bfcb8f1fd56e5;p=python

Merge 3.6 (issue #28635)
---

63e6a7c3f4b72db95fff8fdac60bfcb8f1fd56e5