From: Ned Deily <nad@python.org>
Date: Mon, 2 Jan 2017 07:51:59 +0000 (-0500)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~1638
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dba46d2e96a28e2137347eb28c7d610215c7768e;p=python

merge 3.6
---

dba46d2e96a28e2137347eb28c7d610215c7768e