From: Berker Peksag <berker.peksag@gmail.com>
Date: Fri, 30 Sep 2016 22:07:42 +0000 (+0300)
Subject: Merge from 3.6
X-Git-Tag: v3.7.0a1~2345
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d57d0a7a5357bd204ac1fc386ef016f0cf9d923;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.6
---

2d57d0a7a5357bd204ac1fc386ef016f0cf9d923