From: Yury Selivanov <yury@magic.io>
Date: Thu, 20 Oct 2016 20:31:15 +0000 (-0400)
Subject: Merge 3.6 (issue #26010)
X-Git-Tag: v3.7.0a1~2185
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7c1dfe52a7508017c824291e2acd811e98f1948;p=thirdparty%2FPython%2Fcpython.git

Merge 3.6 (issue #26010)
---

b7c1dfe52a7508017c824291e2acd811e98f1948