From: Jason R. Coombs <jaraco@jaraco.com>
Date: Wed, 29 Jul 2015 18:29:47 +0000 (-0400)
Subject: Merge with 3.5 for Issue #24729
X-Git-Tag: v3.6.0a1~1885
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ada5578f95bcd4b402e0e3111bb65cb70ee0daae;p=python

Merge with 3.5 for Issue #24729
---

ada5578f95bcd4b402e0e3111bb65cb70ee0daae