From: Mariatta Wijaya <mariatta.wijaya@gmail.com>
Date: Tue, 7 Feb 2017 06:05:10 +0000 (-0800)
Subject: Issue #29314: Merge with 3.5
X-Git-Tag: v3.6.1rc1~98
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6138432e591314bd5b05d6856d84188086e694e5;p=python

Issue #29314: Merge with 3.5
---

6138432e591314bd5b05d6856d84188086e694e5