From: Yury Selivanov <yury@magic.io>
Date: Fri, 21 Oct 2016 21:25:02 +0000 (-0400)
Subject: Merge 3.6 (issue #26923)
X-Git-Tag: v3.7.0a1~2171
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=384ec37081de105b5490ee8992220f96092a2835;p=thirdparty%2FPython%2Fcpython.git

Merge 3.6 (issue #26923)
---

384ec37081de105b5490ee8992220f96092a2835