From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 9 Oct 2016 20:08:58 +0000 (+0300)
Subject: Merge from 3.6.
X-Git-Tag: v3.7.0a1~2257
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1aa85a9eeac3f0ec5c6015fa1317e7d56690ac9a;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.6.
---

1aa85a9eeac3f0ec5c6015fa1317e7d56690ac9a