From: Zachary Ware <zachary.ware@gmail.com>
Date: Sat, 24 Oct 2015 06:35:44 +0000 (-0500)
Subject: Null merge with 3.4
X-Git-Tag: v3.5.1rc1~131
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7b83b43ff469edd3d9371164e32fe4d3e4daafa;p=python

Null merge with 3.4
---

a7b83b43ff469edd3d9371164e32fe4d3e4daafa