From: Zachary Ware <zachary.ware@gmail.com>
Date: Sun, 25 Oct 2015 04:27:03 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1166
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3188f1dcbae8feb07d299b5ea3e3987b326016c9;p=python

Merge with 3.5
---

3188f1dcbae8feb07d299b5ea3e3987b326016c9