From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 26 Jan 2017 07:35:46 +0000 (-0800)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~1465
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f473fda02bed878b9015fbd8779f412a0570e9bc;p=python

merge 3.6
---

f473fda02bed878b9015fbd8779f412a0570e9bc