From: Xiang Zhang <angwerzx@126.com>
Date: Tue, 27 Dec 2016 04:32:33 +0000 (+0800)
Subject: Issue #29078: Merge 3.6.
X-Git-Tag: v3.7.0a1~1684
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3b01c3248825fa510a9b69ecb062c8ebc3422f2;p=python

Issue #29078: Merge 3.6.
---

b3b01c3248825fa510a9b69ecb062c8ebc3422f2