From: Zachary Ware <zachary.ware@gmail.com>
Date: Sun, 30 Aug 2015 03:26:54 +0000 (-0500)
Subject: Issue #24962: Merge 3.4
X-Git-Tag: v3.6.0a1~1723^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=072d432f3c6ac9ac3effb37e7bd8b98e0cf3a781;p=python

Issue #24962: Merge 3.4
---

072d432f3c6ac9ac3effb37e7bd8b98e0cf3a781