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

merge 3.6
---

cbaaed1b1ae04eda89102af7565ab5471c83ee30