From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 10 Feb 2017 06:35:38 +0000 (-0800)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~1381
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5f2cc67be80961126e9fbf01c80620130fb4817;p=python

merge 3.6
---

e5f2cc67be80961126e9fbf01c80620130fb4817