From: Zachary Ware <zachary.ware@gmail.com>
Date: Sun, 9 Aug 2015 03:03:43 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.5.0rc1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83ee5a315ffbf6e6601cc5c5e7a692d249efb5ad;p=python

Merge 3.4
---

83ee5a315ffbf6e6601cc5c5e7a692d249efb5ad