From: Zachary Ware <zachary.ware@gmail.com>
Date: Sun, 9 Aug 2015 03:05:05 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1810
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c4a6f8bd0ccf5aa7c138f23a0954aa8c7b2e3fe;p=python

Merge 3.5
---

7c4a6f8bd0ccf5aa7c138f23a0954aa8c7b2e3fe