From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 27 Aug 2015 20:55:48 +0000 (-0500)
Subject: Closes #24947: Merge with 3.5
X-Git-Tag: v3.6.0a1~1729
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a51ffd309925980704d252d5b5d9f2c954d8b8e1;p=python

Closes #24947: Merge with 3.5
---

a51ffd309925980704d252d5b5d9f2c954d8b8e1