From: Brett Cannon <brett@python.org>
Date: Thu, 3 Sep 2015 22:35:33 +0000 (-0700)
Subject: Merge from 3.5 for issue #24913
X-Git-Tag: v3.6.0a1~1677^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ebcc9bcb8ad3de35d6079de177b0f1942f0f001;p=python

Merge from 3.5 for issue #24913
---

1ebcc9bcb8ad3de35d6079de177b0f1942f0f001