From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 30 Dec 2014 16:09:30 +0000 (-0600)
Subject: merge 3.4 (#23130)
X-Git-Tag: v3.5.0a1~264
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=864d57c24452f78f2fcfb557caada47502619b39;p=python

merge 3.4 (#23130)
---

864d57c24452f78f2fcfb557caada47502619b39