From: Xiang Zhang <angwerzx@126.com>
Date: Thu, 22 Dec 2016 07:31:55 +0000 (+0800)
Subject: Issue #29044: Merge 3.6.
X-Git-Tag: v3.7.0a1~1701
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62497d52d940c9e203c1bf5e5d41bba52577ec6a;p=thirdparty%2FPython%2Fcpython.git

Issue #29044: Merge 3.6.
---

62497d52d940c9e203c1bf5e5d41bba52577ec6a