From: Zachary Ware <zachary.ware@gmail.com>
Date: Sat, 5 Dec 2015 06:19:08 +0000 (-0600)
Subject: Closes #25800: Merge with 3.5
X-Git-Tag: v3.6.0a1~952
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dece97768c4cde32a42ac12b0195bf6f9073578;p=python

Closes #25800: Merge with 3.5
---

6dece97768c4cde32a42ac12b0195bf6f9073578