From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 10 Jun 2015 05:44:40 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~2082
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27da359519522820c86930f957da8563e4f77353;p=python

Merge with 3.5
---

27da359519522820c86930f957da8563e4f77353