From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 8 Oct 2016 19:46:01 +0000 (+0300)
Subject: Merge from 3.5.
X-Git-Tag: v3.6.0b2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21d9f10c9442ba646340913beba8cf73cc77c885;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5.
---

21d9f10c9442ba646340913beba8cf73cc77c885