From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 2 Jul 2015 21:19:05 +0000 (-0500)
Subject: merge 3.5 (#24552)
X-Git-Tag: v3.6.0a1~2014
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09dd773c1330a313c867e6ece714d582df637cb0;p=python

merge 3.5 (#24552)
---

09dd773c1330a313c867e6ece714d582df637cb0