From: Xiang Zhang <angwerzx@126.com>
Date: Tue, 10 Jan 2017 02:54:19 +0000 (+0800)
Subject: Issue #29145: Merge 3.5.
X-Git-Tag: v3.6.1rc1~187
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95403d74d7d17f51b50e68a10e0a0972ed77aa2a;p=thirdparty%2FPython%2Fcpython.git

Issue #29145: Merge 3.5.
---

95403d74d7d17f51b50e68a10e0a0972ed77aa2a