From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 4 Jan 2015 22:30:13 +0000 (-0600)
Subject: merge 3.4 (#23167)
X-Git-Tag: v3.5.0a1~248
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc5fdc5bb36f0ecd64fa8caa9edb16946c982469;p=python

merge 3.4 (#23167)
---

dc5fdc5bb36f0ecd64fa8caa9edb16946c982469