From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 27 Jun 2015 20:46:31 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~2036
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5048d3938f8223ea88daeacf64130cde05f9a77;p=python

merge 3.5
---

b5048d3938f8223ea88daeacf64130cde05f9a77