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

merge heads
---

e953a7237668e03b698ca5d241329cc7147c2040