From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 1 Jun 2015 15:14:35 +0000 (-0500)
Subject: merge 3.5 (#24345)
X-Git-Tag: v3.6.0a1~2129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cae0658f09b1bc53f6411b5b27d36cebfd8c6c9d;p=python

merge 3.5 (#24345)
---

cae0658f09b1bc53f6411b5b27d36cebfd8c6c9d