From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 8 Oct 2016 18:35:07 +0000 (+0300)
Subject: Merge from 3.6.
X-Git-Tag: v3.7.0a1~2276
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d56113ed7e3fdab6dc3b644b886d6f720e6cb54;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.6.
---

1d56113ed7e3fdab6dc3b644b886d6f720e6cb54