From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 16 Mar 2015 17:45:27 +0000 (-0500)
Subject: merge 3.4 (#23679)
X-Git-Tag: v3.5.0a3~165
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85586ebc39a6ac9fc1b648777566a54439b84852;p=python

merge 3.4 (#23679)
---

85586ebc39a6ac9fc1b648777566a54439b84852