From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 22 Jul 2015 03:50:43 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0b4~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7841ef48b48a361d22cc1795eff5d826eef20fa;p=python

Merge with 3.4
---

d7841ef48b48a361d22cc1795eff5d826eef20fa