From: Yury Selivanov <yury@magic.io>
Date: Sun, 9 Oct 2016 16:21:03 +0000 (-0400)
Subject: Merge 3.6 (issue #27972)
X-Git-Tag: v3.7.0a1~2259
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4ea2ec38a6d51266425ef5a8947d4fb0772250c;p=python

Merge 3.6 (issue #27972)
---

d4ea2ec38a6d51266425ef5a8947d4fb0772250c