From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 9 Jan 2015 22:40:38 +0000 (-0600)
Subject: merge 3.4 (#23210)
X-Git-Tag: v3.5.0a1~201
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=645f896536e09baaa5151007b93931461509d5ca;p=python

merge 3.4 (#23210)
---

645f896536e09baaa5151007b93931461509d5ca