From: Berker Peksag <berker.peksag@gmail.com>
Date: Tue, 27 Dec 2016 12:09:35 +0000 (+0300)
Subject: Merge from 3.5
X-Git-Tag: v3.6.1rc1~254
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe607beef73b4bfc60f4ce2e4e668c1cf2b99d5a;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

fe607beef73b4bfc60f4ce2e4e668c1cf2b99d5a