From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 10 Sep 2014 21:13:36 +0000 (-0400)
Subject: merge 3.4 (#22380)
X-Git-Tag: v3.5.0a1~936
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eeca5f82fd2645a988cbbed016a7b7100ec91deb;p=python

merge 3.4 (#22380)
---

eeca5f82fd2645a988cbbed016a7b7100ec91deb