From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 7 Jul 2015 05:34:37 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1983
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f20bdb321b683aa1c4a9c8b37e860557fedc170;p=python

Merge 3.5
---

9f20bdb321b683aa1c4a9c8b37e860557fedc170