From: Zachary Ware <zachary.ware@gmail.com>
Date: Sun, 30 Aug 2015 03:27:12 +0000 (-0500)
Subject: Closes #24962: Merge with 3.5
X-Git-Tag: v3.6.0a1~1723
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2f2554d5e80a0d2e5611d02a51a413aa053832e;p=python

Closes #24962: Merge with 3.5
---

e2f2554d5e80a0d2e5611d02a51a413aa053832e