From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 14 Nov 2016 08:15:52 +0000 (-0800)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~1993
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2294f83c7c50ec1d574835231ca7993da1c419e8;p=python

merge 3.6
---

2294f83c7c50ec1d574835231ca7993da1c419e8