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

Issue #24947: Merge 3.4
---

dcc47c6064cfa7b44a13853f14e4819185c8f2a2