From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 16 Jan 2017 08:05:54 +0000 (-0800)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~1554
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=510df6f2721bd6ed69716938c45cea03b2b84c99;p=python

merge 3.6
---

510df6f2721bd6ed69716938c45cea03b2b84c99