From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 14 Apr 2015 20:46:22 +0000 (-0500)
Subject: Closes #23956: Merge with 3.4
X-Git-Tag: v3.5.0a4~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cadbab295d035a60222d0dc882a5e72ebf12c89a;p=python

Closes #23956: Merge with 3.4
---

cadbab295d035a60222d0dc882a5e72ebf12c89a