From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 2 Sep 2015 20:01:42 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1700
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8cbb013553c07e2577d08c7046c0eee70d0c0b66;p=python

Merge with 3.5
---

8cbb013553c07e2577d08c7046c0eee70d0c0b66