From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 24 Aug 2014 23:08:22 +0000 (-0500)
Subject: merge 3.4 (#22265)
X-Git-Tag: v3.5.0a1~1011
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca18be6db2e95720a9904ecfe69012cd2058a344;p=python

merge 3.4 (#22265)
---

ca18be6db2e95720a9904ecfe69012cd2058a344