From: Brett Cannon <brett@python.org>
Date: Fri, 18 Sep 2015 22:17:37 +0000 (-0700)
Subject: Merge for issue #24915
X-Git-Tag: v3.6.0a1~1518
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36df60fe75dee098827cc2743afdb78b9a335491;p=thirdparty%2FPython%2Fcpython.git

Merge for issue #24915
---

36df60fe75dee098827cc2743afdb78b9a335491