From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 9 May 2015 01:32:36 +0000 (-0400)
Subject: merge 3.4 (#23042)
X-Git-Tag: v3.5.0b1~222
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43e3d22fee9b22f6f9dec4364ea4ee796faefaab;p=python

merge 3.4 (#23042)
---

43e3d22fee9b22f6f9dec4364ea4ee796faefaab