From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 21 Oct 2016 05:39:39 +0000 (-0700)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~2179
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2bc46da140fd87df7aac953295ed96b7c90668b;p=python

merge 3.6
---

a2bc46da140fd87df7aac953295ed96b7c90668b