From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 14 Sep 2016 05:46:57 +0000 (-0700)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~2497
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3310c87d370573ee63cd3a49e610a338ed758ef2;p=python

merge 3.6
---

3310c87d370573ee63cd3a49e610a338ed758ef2