From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 13 Sep 2016 05:09:52 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.6.0b2~232
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a9e993f412551607b74fe83344a8fda11a17425;p=python

merge heads
---

7a9e993f412551607b74fe83344a8fda11a17425