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

Merge 3.6 (issue #28653)
---

3e05a9c2b0bedc1fdcc3d151c834c0f1b5eece06