From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 3 Jul 2014 16:03:46 +0000 (-0500)
Subject: Closes #21151: Merge with 3.4
X-Git-Tag: v3.5.0a1~1351
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8b129f279ba3a25c633f600d457f408ab27114e;p=python

Closes #21151: Merge with 3.4
---

d8b129f279ba3a25c633f600d457f408ab27114e