From: Brett Cannon <brett@python.org>
Date: Fri, 14 Aug 2015 18:09:56 +0000 (-0700)
Subject: Merge from 3.5 for issue #24492
X-Git-Tag: v3.6.0a1~1791
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8683762884e82c81b8c5c0db8aa4045c3fbb284;p=python

Merge from 3.5 for issue #24492
---

d8683762884e82c81b8c5c0db8aa4045c3fbb284