From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 7 Jun 2014 19:39:51 +0000 (-0700)
Subject: merge 3.4 (#21642)
X-Git-Tag: v3.5.0a1~1500
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e439797bad59948ff810aeaf7e992b23451ddd6;p=python

merge 3.4 (#21642)
---

3e439797bad59948ff810aeaf7e992b23451ddd6