From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 7 Jul 2015 04:33:33 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1986
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b42059c60881f7fb41bc4dfff8c936f9d5108ca;p=python

Merge 3.5
---

6b42059c60881f7fb41bc4dfff8c936f9d5108ca