From: Berker Peksag <berker.peksag@gmail.com>
Date: Wed, 15 Jun 2016 15:13:12 +0000 (+0300)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a3~138
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0f2960f45335b714e45a97fce062bafdfb06294;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

f0f2960f45335b714e45a97fce062bafdfb06294