From: Yury Selivanov <yury@magic.io>
Date: Wed, 9 Nov 2016 00:20:08 +0000 (-0500)
Subject: Merge 3.6
X-Git-Tag: v3.7.0a1~2029
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff0273fb20470fd48d4df92c7cd67cb4ec409b57;p=python

Merge 3.6
---

ff0273fb20470fd48d4df92c7cd67cb4ec409b57