From: Zachary Ware <zachary.ware@gmail.com>
Date: Mon, 13 Apr 2015 21:44:05 +0000 (-0500)
Subject: Closes #23730: merge with 3.4
X-Git-Tag: v3.5.0a4~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d827be8ff1e74b35191aa51e7b66acb8a13b9db9;p=python

Closes #23730: merge with 3.4
---

d827be8ff1e74b35191aa51e7b66acb8a13b9db9