From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 11 Sep 2015 15:52:36 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~377
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f505165d009ed2bb92f641484a11fbde6544fcb4;p=python

Merge with 3.4
---

f505165d009ed2bb92f641484a11fbde6544fcb4