From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 30 Sep 2014 03:02:56 +0000 (-0400)
Subject: merge 3.4 (#22520)
X-Git-Tag: v3.5.0a1~820
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd97a6fb2d501f0ecb104513b5c0c1707dd6f87e;p=python

merge 3.4 (#22520)
---

fd97a6fb2d501f0ecb104513b5c0c1707dd6f87e