From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Jan 2017 04:30:49 +0000 (-0600)
Subject: merge heads
X-Git-Tag: v3.7.0a1~1640
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41555bf35c3b6b4d4c145bc04825d761508b3dc4;p=python

merge heads
---

41555bf35c3b6b4d4c145bc04825d761508b3dc4