From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 31 Oct 2016 18:15:48 +0000 (+0200)
Subject: Merge from 3.6.
X-Git-Tag: v3.7.0a1~2084
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e325d9c41d91f30a9bb44f9d05b8e924e57d1af;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.6.
---

5e325d9c41d91f30a9bb44f9d05b8e924e57d1af