From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 11 Jun 2014 20:28:31 +0000 (-0500)
Subject: Closes #21713: Merge with 3.4
X-Git-Tag: v3.5.0a1~1462
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbb7aa5bd1a07c75bb769ce978161863e31232ba;p=python

Closes #21713: Merge with 3.4
---

dbb7aa5bd1a07c75bb769ce978161863e31232ba