From: Zachary Ware <zachary.ware@gmail.com>
Date: Sat, 29 Aug 2015 05:13:14 +0000 (-0500)
Subject: Closes #24953: Merge with 3.5
X-Git-Tag: v3.6.0a1~1725
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95c0646547177a2e6a1f9bb24c4e45c0c42038a1;p=thirdparty%2FPython%2Fcpython.git

Closes #24953: Merge with 3.5
---

95c0646547177a2e6a1f9bb24c4e45c0c42038a1