From: Xiang Zhang <angwerzx@126.com>
Date: Fri, 20 Jan 2017 03:29:48 +0000 (+0800)
Subject: Issue #29292: Merge 3.5.
X-Git-Tag: v3.6.1rc1~159
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=346454c7f5e261232d33da5d7493985fd6b2ffad;p=thirdparty%2FPython%2Fcpython.git

Issue #29292: Merge 3.5.
---

346454c7f5e261232d33da5d7493985fd6b2ffad