From: Brett Cannon <brett@python.org>
Date: Fri, 15 Apr 2016 19:44:09 +0000 (-0700)
Subject: Merge for issue #26760
X-Git-Tag: v3.6.0a1~201
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f8a1cc0f716d9e112ce1cc0a8552f481c51f7be;p=thirdparty%2FPython%2Fcpython.git

Merge for issue #26760
---

1f8a1cc0f716d9e112ce1cc0a8552f481c51f7be