From: Ned Deily <nad@python.org>
Date: Fri, 20 Jan 2017 15:17:11 +0000 (-0500)
Subject: Issue #29316: merge 3.6
X-Git-Tag: v3.7.0a1~1498
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88f5746c225e5c5689e8a20ed5d37934dc48d3bb;p=python

Issue #29316: merge 3.6
---

88f5746c225e5c5689e8a20ed5d37934dc48d3bb