From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 22 Jul 2015 03:50:54 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1939
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cafc34fa3d511e87056b532d7ba01961c5476152;p=python

Merge with 3.5
---

cafc34fa3d511e87056b532d7ba01961c5476152