From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 28 Oct 2015 03:05:09 +0000 (-0500)
Subject: Closes #25494: Merge with 3.5
X-Git-Tag: v3.6.0a1~1160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24fa60c8d5b682d1039d27c1cefae512800c4d8f;p=python

Closes #25494: Merge with 3.5
---

24fa60c8d5b682d1039d27c1cefae512800c4d8f