From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 23 Sep 2014 02:44:21 +0000 (-0400)
Subject: merge 3.4 (#22459)
X-Git-Tag: v3.5.0a1~876
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21df71ae8e9f7ed1a0f3de6923fa30961ac15888;p=python

merge 3.4 (#22459)
---

21df71ae8e9f7ed1a0f3de6923fa30961ac15888