From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 17 Sep 2016 13:22:14 +0000 (+0300)
Subject: Merge from 3.6
X-Git-Tag: v3.7.0a1~2459
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=042ce8a594257aff60b4d0291ad23a98b83a26fd;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.6
---

042ce8a594257aff60b4d0291ad23a98b83a26fd