From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 27 Feb 2015 07:40:41 +0000 (-0600)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a2~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad9296e4037c4ff94c6bba83637759f8f40ee31b;p=python

Merge with 3.4
---

ad9296e4037c4ff94c6bba83637759f8f40ee31b