From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 7 Jul 2015 05:00:43 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.5.0b4~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ffc3d44804ae019ed801db48ff674adc53ce0c9;p=python

Merge 3.4
---

4ffc3d44804ae019ed801db48ff674adc53ce0c9