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

Merge with 3.5
---

a31ddb33511f92d20dfddb23d934a0b7f4ab6122