From: Yury Selivanov <yury@magic.io>
Date: Thu, 15 Sep 2016 16:50:51 +0000 (-0400)
Subject: Merge 3.6 (issue #26182)
X-Git-Tag: v3.7.0a1~2488
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96a042253f0131ec2270c6c3ad2f6bba12fc2bc9;p=thirdparty%2FPython%2Fcpython.git

Merge 3.6 (issue #26182)
---

96a042253f0131ec2270c6c3ad2f6bba12fc2bc9