From: Xiang Zhang <angwerzx@126.com>
Date: Fri, 20 Jan 2017 03:31:31 +0000 (+0800)
Subject: Issue #29292: Merge 3.6.
X-Git-Tag: v3.7.0a1~1501
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8160236ed89a54b99aebc9922cdb1fbdb1e5351;p=thirdparty%2FPython%2Fcpython.git

Issue #29292: Merge 3.6.
---

f8160236ed89a54b99aebc9922cdb1fbdb1e5351