From: Zachary Ware <zachary.ware@gmail.com>
Date: Mon, 13 Apr 2015 23:34:57 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a4~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5aec1a44e89d31cc000d47c8ac0afdb6a280e765;p=python

Merge with 3.4
---

5aec1a44e89d31cc000d47c8ac0afdb6a280e765