From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 6 Aug 2015 05:05:13 +0000 (-0500)
Subject: Closes #21279: Merge with 3.5
X-Git-Tag: v3.6.0a1~1824
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=070bd62cfa144bfa62ec7766a936d9c7b360861b;p=python

Closes #21279: Merge with 3.5
---

070bd62cfa144bfa62ec7766a936d9c7b360861b