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

merge 3.5 (#24522)
---

b2b7ac183d844ace7587bd3b786b8f3eb3843268