From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 2 Apr 2015 04:08:10 +0000 (-0400)
Subject: merge 3.4 (#23844)
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b9df0d33ba5f35e7c8b15cb9298b7706b1a9bdc;p=python

merge 3.4 (#23844)
---

4b9df0d33ba5f35e7c8b15cb9298b7706b1a9bdc