From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 18 Jul 2014 14:14:55 +0000 (-0500)
Subject: Closes #22004: Merge with 3.4
X-Git-Tag: v3.5.0a1~1258
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efe030c60957707a49cfed706e5d119da4c4cede;p=thirdparty%2FPython%2Fcpython.git

Closes #22004: Merge with 3.4
---

efe030c60957707a49cfed706e5d119da4c4cede