From: Mariatta Wijaya <mariatta.wijaya@gmail.com>
Date: Tue, 7 Feb 2017 06:06:04 +0000 (-0800)
Subject: Issue #29314: Merge with 3.6
X-Git-Tag: v3.7.0a1~1396
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=189413dcfe1a3e8747457e3d5b6f66f8cd312e15;p=python

Issue #29314: Merge with 3.6
---

189413dcfe1a3e8747457e3d5b6f66f8cd312e15