From: Yury Selivanov <yury@magic.io>
Date: Fri, 16 Dec 2016 16:52:36 +0000 (-0500)
Subject: Merge 3.6 (issue #28990)
X-Git-Tag: v3.7.0a1~1736^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c3e71163b9aa53caf5e5b73520a07968f39686c;p=python

Merge 3.6 (issue #28990)
---

7c3e71163b9aa53caf5e5b73520a07968f39686c