From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 5 Aug 2015 02:59:09 +0000 (-0500)
Subject: Closes #24751: Merge with 3.5
X-Git-Tag: v3.6.0a1~1840
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e435e2d113593fc36389592d7165941b9ea399b;p=python

Closes #24751: Merge with 3.5
---

6e435e2d113593fc36389592d7165941b9ea399b