From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 6 Oct 2015 20:23:16 +0000 (-0500)
Subject: Issue #25097: Merge with 3.5
X-Git-Tag: v3.6.0a1~1315
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c456861f997c5c8ae3281cd245af541fbef20071;p=python

Issue #25097: Merge with 3.5
---

c456861f997c5c8ae3281cd245af541fbef20071