From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 13 Sep 2016 05:10:02 +0000 (-0700)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~2517
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58c1f14ca132140baefff4478266970b1ec8e6d4;p=python

merge 3.6
---

58c1f14ca132140baefff4478266970b1ec8e6d4