From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 26 May 2014 22:12:43 +0000 (-0700)
Subject: merge 3.4 (#21587)
X-Git-Tag: v3.5.0a1~1589
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c12318a7fd49b2a6f2f8f42b631550bc022da32c;p=python

merge 3.4 (#21587)
---

c12318a7fd49b2a6f2f8f42b631550bc022da32c