From: Xiang Zhang <angwerzx@126.com>
Date: Mon, 9 Jan 2017 03:52:10 +0000 (+0800)
Subject: Issue #29142: Merge 3.6.
X-Git-Tag: v3.7.0a1~1598
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04c15d5bdc1960be67b4d93f846141e6451a0c6c;p=thirdparty%2FPython%2Fcpython.git

Issue #29142: Merge 3.6.
---

04c15d5bdc1960be67b4d93f846141e6451a0c6c