From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 6 Jan 2015 06:45:52 +0000 (-0600)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~240
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4908f7158f7c28f8c43a8ce4073de3b8378c5b51;p=python

Merge with 3.4
---

4908f7158f7c28f8c43a8ce4073de3b8378c5b51