From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 20 Feb 2015 04:15:54 +0000 (-0600)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a2~118
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4785f5e24930fa1cb9072c59d2963d148620127d;p=python

Merge with 3.4
---

4785f5e24930fa1cb9072c59d2963d148620127d