From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 9 Aug 2016 21:21:17 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a4~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1aa913e13417e05939db49421c77d232ee7a2b7f;p=python

Merge with 3.5
---

1aa913e13417e05939db49421c77d232ee7a2b7f