From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 3 May 2015 17:00:37 +0000 (-0400)
Subject: merge 3.4 (#24118)
X-Git-Tag: v3.5.0b1~250
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b174b85c1a37ee7452d26d041c30519425e4d421;p=python

merge 3.4 (#24118)
---

b174b85c1a37ee7452d26d041c30519425e4d421