From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 15 Dec 2014 15:05:13 +0000 (-0500)
Subject: merge 3.4 (#23053)
X-Git-Tag: v3.5.0a1~316
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d33598e5dd021aaac4f155ab319bad3ba4e1eef;p=python

merge 3.4 (#23053)
---

8d33598e5dd021aaac4f155ab319bad3ba4e1eef