From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 4 Jun 2016 05:38:42 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.6.0a2~149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4604d6d6adc872585acdf957be4615f5f14c396;p=python

merge heads
---

f4604d6d6adc872585acdf957be4615f5f14c396