From: Zachary Ware <zachary.ware@gmail.com>
Date: Sun, 2 Aug 2015 02:57:22 +0000 (-0500)
Subject: Issue #23182: Merge with 3.4
X-Git-Tag: v3.6.0a1~1860^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13db76a9743f4a414339efb1cfd5b3365806e463;p=python

Issue #23182: Merge with 3.4
---

13db76a9743f4a414339efb1cfd5b3365806e463