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

Closes #22178: Merge with 3.4
---

05b90a54d9c83401535139388a7cfe956f079efa