From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 1 Feb 2017 07:31:20 +0000 (-0800)
Subject: merge 3.6 (#29398)
X-Git-Tag: v3.7.0a1~1449
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2145387abc6b1b3b2695cac72cbfc83b5efeeec9;p=python

merge 3.6 (#29398)
---

2145387abc6b1b3b2695cac72cbfc83b5efeeec9