From: Zachary Ware <zachary.ware@gmail.com>
Date: Mon, 13 Apr 2015 16:08:55 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a4~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b1e4f1427b2cf30de8cae48fe1fd3791e489072;p=python

Merge with 3.4
---

0b1e4f1427b2cf30de8cae48fe1fd3791e489072