From: Yury Selivanov <yury@magic.io>
Date: Tue, 15 Nov 2016 20:27:48 +0000 (-0500)
Subject: Merge 3.6 (issue #28704)
X-Git-Tag: v3.7.0a1~1979
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22131a3e192921716d5373118d7d54326f7d255e;p=python

Merge 3.6 (issue #28704)
---

22131a3e192921716d5373118d7d54326f7d255e