From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 22 Jul 2015 03:34:16 +0000 (-0500)
Subject: Issue #24680: Merge with 3.4
X-Git-Tag: v3.5.0b4~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8115b8ba56ad33085e4447fc17de9fa9a682c8b;p=python

Issue #24680: Merge with 3.4
---

c8115b8ba56ad33085e4447fc17de9fa9a682c8b