From: Xiang Zhang <angwerzx@126.com>
Date: Fri, 30 Dec 2016 03:58:14 +0000 (+0800)
Subject: Issue #29112: Merge 3.6.
X-Git-Tag: v3.7.0a1~1662
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dfe14c462de137311eafdd80feb1e08b31b9485a;p=python

Issue #29112: Merge 3.6.
---

dfe14c462de137311eafdd80feb1e08b31b9485a