From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 2 Feb 2016 23:04:56 +0000 (-0600)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~656
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71e8134f20adbd2f89ac21738390fb7668073548;p=python

Merge with 3.5
---

71e8134f20adbd2f89ac21738390fb7668073548