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

Issue #29217: Merge 3.5.
---

2427d0029824a1ef21b822b529f84eaee57acaf4