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

Merge from 3.5.0 for issue #24492
---

7c97a05618733b93f0a6e80ad5b672c2f966f448