From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 11 Sep 2015 15:52:51 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1580
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3619e12a4f1623ccb77bbe25163a3e26a9b43445;p=python

Merge with 3.5
---

3619e12a4f1623ccb77bbe25163a3e26a9b43445