From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 8 Sep 2015 04:32:10 +0000 (-0500)
Subject: Closes #25010: Merge with 3.5
X-Git-Tag: v3.6.0a1~1641
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fcec42c3a87f71686ed95e9176b2a441c3398f2e;p=python

Closes #25010: Merge with 3.5
---

fcec42c3a87f71686ed95e9176b2a441c3398f2e