From: Xiang Zhang <angwerzx@126.com>
Date: Thu, 22 Dec 2016 07:31:22 +0000 (+0800)
Subject: Issue #29044: Merge 3.5.
X-Git-Tag: v3.6.1rc1~272
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=437a5d2c25c2f64ddcdbf9c509d406071c74c1fb;p=python

Issue #29044: Merge 3.5.
---

437a5d2c25c2f64ddcdbf9c509d406071c74c1fb