From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 6 Apr 2015 17:06:21 +0000 (-0400)
Subject: merge 3.4 (#23875)
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d71c97ec3f4c8f37c81e57a35d53114a6344932;p=python

merge 3.4 (#23875)
---

7d71c97ec3f4c8f37c81e57a35d53114a6344932