From: Berker Peksag <berker.peksag@gmail.com>
Date: Mon, 26 Sep 2016 19:44:51 +0000 (+0300)
Subject: Merge from 3.6
X-Git-Tag: v3.7.0a1~2387
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ff400fd0aeeba7df2a12d148c4a5b60867de75b;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.6
---

0ff400fd0aeeba7df2a12d148c4a5b60867de75b