From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 29 Jul 2016 00:01:09 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a4~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10ea19f69c0bdb2c47aaa29c62dcb1f41825a3dc;p=python

Merge with 3.5
---

10ea19f69c0bdb2c47aaa29c62dcb1f41825a3dc