From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 7 Dec 2016 11:32:09 +0000 (+0200)
Subject: Merge from 3.6.
X-Git-Tag: v3.7.0a1~1817
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7d266c11387388bb1abe739e9011f5219861b63;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.6.
---

d7d266c11387388bb1abe739e9011f5219861b63