From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 18 Aug 2014 04:01:33 +0000 (-0500)
Subject: merge 3.4 (closes #22200)
X-Git-Tag: v3.5.0a1~1047
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5847414f9e46ccac42689196e5656b1be0dc957;p=python

merge 3.4 (closes #22200)
---

c5847414f9e46ccac42689196e5656b1be0dc957