From: Yury Selivanov <yury@magic.io>
Date: Thu, 15 Sep 2016 19:46:40 +0000 (-0400)
Subject: Merge 3.6 (issue #28174)
X-Git-Tag: v3.7.0a1~2477
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01683d86f241a591bfd18cb130a98323fc2d4055;p=python

Merge 3.6 (issue #28174)
---

01683d86f241a591bfd18cb130a98323fc2d4055