From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 17 Oct 2014 19:24:43 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~641
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f88cad00877d4084a89ac7bdbd6d037e9b5d8b98;p=python

Merge with 3.4
---

f88cad00877d4084a89ac7bdbd6d037e9b5d8b98