From: Brett Cannon <brett@python.org>
Date: Thu, 3 Sep 2015 22:34:57 +0000 (-0700)
Subject: Merge from 3.5.0 for issue #24913
X-Git-Tag: v3.6.0a1~1677^2~2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84368127edf1a166c5940332f79265891960aab7;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5.0 for issue #24913
---

84368127edf1a166c5940332f79265891960aab7