From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 31 Dec 2016 19:49:31 +0000 (+0300)
Subject: Issue #29123: Merge from 3.5
X-Git-Tag: v3.6.1rc1~230
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75d9016530369999e099a247f260f76f544dc20d;p=thirdparty%2FPython%2Fcpython.git

Issue #29123: Merge from 3.5
---

75d9016530369999e099a247f260f76f544dc20d