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

merge 3.4 (closes #22643)
---

736982d36dd513233a2b0e0c05b2eb3b514c3d97