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

Merge from 3.6.
---

74a7e3b981265e4f742658b19bdac0818e364920