From: Brett Cannon <brett@python.org>
Date: Fri, 8 Apr 2016 22:08:01 +0000 (-0700)
Subject: Merge w/ 3.5 for issue #26587
X-Git-Tag: v3.6.0a1~254
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8278d13f0ed41fee1eeb8eed38ff63d38f3cdaac;p=thirdparty%2FPython%2Fcpython.git

Merge w/ 3.5 for issue #26587
---

8278d13f0ed41fee1eeb8eed38ff63d38f3cdaac