From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 28 May 2016 21:06:48 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.6.0a2~210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f558d5f284d531c058e229452154de5ebe003b1c;p=python

merge heads
---

f558d5f284d531c058e229452154de5ebe003b1c