From: Zachary Ware <zachary.ware@gmail.com>
Date: Sat, 17 Jan 2015 14:53:09 +0000 (-0600)
Subject: Merge with 3.4 (#23256)
X-Git-Tag: v3.5.0a1~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e262074ede78087c079094e28bb1d09a40072471;p=python

Merge with 3.4 (#23256)
---

e262074ede78087c079094e28bb1d09a40072471