From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 28 Oct 2015 03:01:02 +0000 (-0500)
Subject: Issue #25494: Merge with 3.4
X-Git-Tag: v3.5.1rc1~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32dcf40af0be40d2c8db08a76bb4a878bf6718d0;p=python

Issue #25494: Merge with 3.4
---

32dcf40af0be40d2c8db08a76bb4a878bf6718d0