From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 16 Jun 2014 03:52:02 +0000 (-0700)
Subject: merge 3.4 (#13779)
X-Git-Tag: v3.5.0a1~1443^2~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b521fc9de6b58707632eb0da4f871f37a525616;p=python

merge 3.4 (#13779)
---

5b521fc9de6b58707632eb0da4f871f37a525616