From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 4 Jun 2015 19:34:43 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~2103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c474172cb3d645f766408082f75fa8395a08462;p=python

merge 3.5
---

9c474172cb3d645f766408082f75fa8395a08462