From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 1 Dec 2015 04:57:22 +0000 (-0600)
Subject: Closes #25767: Merge with 3.5
X-Git-Tag: v3.6.0a1~970
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df144092a340381c1916e5f2e0897f441d3f2439;p=python

Closes #25767: Merge with 3.5
---

df144092a340381c1916e5f2e0897f441d3f2439