From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 10 Oct 2014 21:05:54 +0000 (-0500)
Subject: Closes #15414: Merge with 3.4
X-Git-Tag: v3.5.0a1~702
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc260a9a97156cc1cfee88b5947ed99d6b37025a;p=python

Closes #15414: Merge with 3.4
---

fc260a9a97156cc1cfee88b5947ed99d6b37025a