From: Yury Selivanov <yury@magic.io>
Date: Wed, 5 Oct 2016 22:29:33 +0000 (-0400)
Subject: Merge 3.6 (issue #28371)
X-Git-Tag: v3.7.0a1~2296
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f298f71f309b7ac11419c7099d2efd3aacfbdf3;p=thirdparty%2FPython%2Fcpython.git

Merge 3.6 (issue #28371)
---

2f298f71f309b7ac11419c7099d2efd3aacfbdf3