From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 15 Sep 2016 06:54:09 +0000 (-0700)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~2489
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=640463acb1d7f88fc12c18d48515178158760b60;p=python

merge 3.6
---

640463acb1d7f88fc12c18d48515178158760b60