From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 14 Sep 2016 05:46:45 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.6.0b2~219
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66c8dfb56522087d22b550bff15c914bea54f182;p=python

merge heads
---

66c8dfb56522087d22b550bff15c914bea54f182