From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 5 Aug 2014 19:02:11 +0000 (-0500)
Subject: Closes #22146: Merge with 3.4
X-Git-Tag: v3.5.0a1~1112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1151c8b7bf8c7d1857032187ad6a30c2064d569e;p=python

Closes #22146: Merge with 3.4
---

1151c8b7bf8c7d1857032187ad6a30c2064d569e