From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 30 Aug 2016 15:03:32 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0b1~524
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=613debcf0a0409b49ad4e1ee63dfc73119029755;p=python

Merge with 3.5
---

613debcf0a0409b49ad4e1ee63dfc73119029755