From: Zachary Ware <zachary.ware@gmail.com>
Date: Sat, 30 Jan 2016 01:09:41 +0000 (-0600)
Subject: Issue #25934: Merge with 3.5
X-Git-Tag: v3.6.0a1~674
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03178a5f7eb7af39b07ef43834c815ade6a394e6;p=python

Issue #25934: Merge with 3.5
---

03178a5f7eb7af39b07ef43834c815ade6a394e6