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

Merge from 3.5
---

f84f259b0bc0fcf41ec243d9b6f3f0463d388eb7