From: Yury Selivanov <yury@magic.io>
Date: Mon, 12 Dec 2016 21:45:21 +0000 (-0500)
Subject: Merge 3.6 (issue #28089)
X-Git-Tag: v3.7.0a1~1766
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bf85b692b8abf5c312c728436b9eea50c6cf682;p=python

Merge 3.6 (issue #28089)
---

8bf85b692b8abf5c312c728436b9eea50c6cf682