From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 4 Feb 2016 04:07:08 +0000 (-0600)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~655
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e922289620af49e9eb928679da4f5637fd75f924;p=python

Merge with 3.5
---

e922289620af49e9eb928679da4f5637fd75f924