From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 19 Sep 2016 02:19:38 +0000 (-0700)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~2436
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=630783d8115221b202004da6a617a794af897e83;p=python

merge 3.6
---

630783d8115221b202004da6a617a794af897e83