From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 8 Sep 2015 04:31:49 +0000 (-0500)
Subject: Issue #25010: Merge with 3.4
X-Git-Tag: v3.5.1rc1~422
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70b7539f9c61f4e41105dd49547dcecb4beb0f8b;p=python

Issue #25010: Merge with 3.4
---

70b7539f9c61f4e41105dd49547dcecb4beb0f8b