From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 3 Sep 2015 16:54:51 +0000 (-0500)
Subject: Closes #24974: Merge with 3.5
X-Git-Tag: v3.6.0a1~1682
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4951059f2331e5da4fa50d5b05080b21cce23f2;p=python

Closes #24974: Merge with 3.5
---

f4951059f2331e5da4fa50d5b05080b21cce23f2