From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 13 Sep 2016 05:10:07 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.7.0a1~2516
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b12881e8213a40418d84ba25c00fbea877a63b4a;p=python

merge heads
---

b12881e8213a40418d84ba25c00fbea877a63b4a