From: Berker Peksag <berker.peksag@gmail.com>
Date: Tue, 14 Jun 2016 11:19:33 +0000 (+0300)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a3~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=357be7ccdb85257b42f63f13def43cbd55d4c9fe;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

357be7ccdb85257b42f63f13def43cbd55d4c9fe