From: Jason R. Coombs <jaraco@jaraco.com>
Date: Sun, 28 Jun 2015 15:15:13 +0000 (-0400)
Subject: Issue #20387: Merge with 3.5
X-Git-Tag: v3.6.0a1~2032
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbc50d96b8b060ef6524439ea293b63514865d81;p=python

Issue #20387: Merge with 3.5
---

cbc50d96b8b060ef6524439ea293b63514865d81