From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Jan 2017 04:30:35 +0000 (-0600)
Subject: merge 3.6 (#29057)
X-Git-Tag: v3.7.0a1~1641
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=646bf754e335d179a8d7e58162b72234b07b0919;p=python

merge 3.6 (#29057)
---

646bf754e335d179a8d7e58162b72234b07b0919