From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 15 Oct 2014 17:40:15 +0000 (-0400)
Subject: merge 3.4 (#22643)
X-Git-Tag: v3.5.0a1~652
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc8899f0e2e04a5b6f5a4aae5b91be04feccb711;p=python

merge 3.4 (#22643)
---

dc8899f0e2e04a5b6f5a4aae5b91be04feccb711