From: Yury Selivanov <yury@magic.io>
Date: Wed, 5 Oct 2016 23:40:40 +0000 (-0400)
Subject: Merge 3.6 (issue #23749)
X-Git-Tag: v3.7.0a1~2294
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4ed4374b2a495fb9abcd5e9971af9113aeb8000;p=python

Merge 3.6 (issue #23749)
---

d4ed4374b2a495fb9abcd5e9971af9113aeb8000