From: Zachary Ware <zachary.ware@gmail.com>
Date: Mon, 13 Apr 2015 16:32:01 +0000 (-0500)
Subject: Closes #23932: Merge with 3.4
X-Git-Tag: v3.5.0a4~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f103462fb0ebfdc4a1901e4dbb72cbaa11f1fd2;p=python

Closes #23932: Merge with 3.4
---

3f103462fb0ebfdc4a1901e4dbb72cbaa11f1fd2