From: Zachary Ware <zachary.ware@gmail.com>
Date: Sun, 30 Aug 2015 03:40:37 +0000 (-0500)
Subject: Issue #24272: Merge with 3.5
X-Git-Tag: v3.6.0a1~1722
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46c9c0d61cf45f52be69e0552b20ecfa9a7c4f42;p=python

Issue #24272: Merge with 3.5
---

46c9c0d61cf45f52be69e0552b20ecfa9a7c4f42