From: Brett Cannon <brett@python.org>
Date: Fri, 16 Oct 2015 19:09:56 +0000 (-0700)
Subject: Merge for issue #25407
X-Git-Tag: v3.6.0a1~1204
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa15ea4b4e15a5350c34fe1ef0b8761d92fd4688;p=thirdparty%2FPython%2Fcpython.git

Merge for issue #25407
---

aa15ea4b4e15a5350c34fe1ef0b8761d92fd4688