From: Yury Selivanov <yury@magic.io>
Date: Fri, 21 Oct 2016 21:14:17 +0000 (-0400)
Subject: Merge 3.6 (issue #28500)
X-Git-Tag: v3.7.0a1~2172
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5cd8a29f39662ef0756027f73556639c54fceb2;p=python

Merge 3.6 (issue #28500)
---

f5cd8a29f39662ef0756027f73556639c54fceb2