From: Ned Deily <nad@python.org>
Date: Tue, 11 Oct 2016 00:56:44 +0000 (-0400)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~2249
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96cbbdd8c7b7b980e21a68e694907335ec934df4;p=python

merge 3.6
---

96cbbdd8c7b7b980e21a68e694907335ec934df4