From: Xiang Zhang <angwerzx@126.com>
Date: Tue, 10 Jan 2017 03:30:44 +0000 (+0800)
Subject: Issue #29217: Merge 3.6.
X-Git-Tag: v3.7.0a1~1588
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbdfecebd2451d8a114da8a0bd0ba9eebcbb6e86;p=python

Issue #29217: Merge 3.6.
---

dbdfecebd2451d8a114da8a0bd0ba9eebcbb6e86