From: Xiang Zhang <angwerzx@126.com>
Date: Fri, 30 Dec 2016 03:57:40 +0000 (+0800)
Subject: Issue #29112: Merge 3.5.
X-Git-Tag: v3.6.1rc1~239
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ea82ddad55d38ffad3cff5ce8afadaf0eaa59a3;p=thirdparty%2FPython%2Fcpython.git

Issue #29112: Merge 3.5.
---

9ea82ddad55d38ffad3cff5ce8afadaf0eaa59a3