From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 1 Jun 2016 05:01:21 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a2~195
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6ce44c4127790c4a98e2cd0dc7443f53fa678e1;p=python

Merge with 3.5
---

d6ce44c4127790c4a98e2cd0dc7443f53fa678e1