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

Merge with 3.5
---

003359370bf434baa4437d882bee953f78220ef5