From: Yury Selivanov <yury@magic.io>
Date: Mon, 7 Nov 2016 21:07:58 +0000 (-0500)
Subject: Merge 3.6 (issue #28634)
X-Git-Tag: v3.7.0a1~2047
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=884edfcc83ec064300a9fb7bde7fece5920e670d;p=thirdparty%2FPython%2Fcpython.git

Merge 3.6 (issue #28634)
---

884edfcc83ec064300a9fb7bde7fece5920e670d