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

merge 3.5
---

cdf71c4836ea27c2c5447beb8d8e5cdf4d6da961