From: Yury Selivanov <yury@magic.io>
Date: Thu, 10 Nov 2016 18:26:06 +0000 (-0500)
Subject: Merge 3.6 (issue #28635)
X-Git-Tag: v3.7.0a1~2015
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69e0323ff2cf4ffff033e2c84bb056aac58fa81c;p=python

Merge 3.6 (issue #28635)
---

69e0323ff2cf4ffff033e2c84bb056aac58fa81c