From: Zachary Ware <zachary.ware@gmail.com>
Date: Sun, 2 Aug 2015 03:00:17 +0000 (-0500)
Subject: Closes #23182: Merge with 3.5
X-Git-Tag: v3.6.0a1~1860
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9dd6ddc7875100ff7f9b223061b3748bd20de650;p=python

Closes #23182: Merge with 3.5
---

9dd6ddc7875100ff7f9b223061b3748bd20de650