From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 10 Sep 2015 20:03:02 +0000 (-0500)
Subject: Closes #25022: Merge with 3.5
X-Git-Tag: v3.6.0a1~1600
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d038b78599deb1a0e0822b6645ff419e58a68f44;p=python

Closes #25022: Merge with 3.5
---

d038b78599deb1a0e0822b6645ff419e58a68f44