From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 22 Jul 2015 03:34:48 +0000 (-0500)
Subject: Closes #24680: Merge with 3.5
X-Git-Tag: v3.6.0a1~1940
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97efb8939cb256ba42160010add1a642436905b4;p=python

Closes #24680: Merge with 3.5
---

97efb8939cb256ba42160010add1a642436905b4