From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 6 Oct 2015 20:22:41 +0000 (-0500)
Subject: Issue #25097: Merge with 3.4
X-Git-Tag: v3.5.1rc1~205
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af34b248d1fb7b381294f2dfaa48f3615d9f625f;p=python

Issue #25097: Merge with 3.4
---

af34b248d1fb7b381294f2dfaa48f3615d9f625f