From: Yury Selivanov <yury@magic.io>
Date: Mon, 21 Nov 2016 22:47:54 +0000 (-0500)
Subject: Merge 3.6 (issue #28652)
X-Git-Tag: v3.7.0a1~1907
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4878d001b173788c9dceb756c6e76aa5ed111967;p=python

Merge 3.6 (issue #28652)
---

4878d001b173788c9dceb756c6e76aa5ed111967