From: Ned Deily <nad@python.org>
Date: Tue, 13 Sep 2016 15:35:00 +0000 (-0400)
Subject: merge from 3.6
X-Git-Tag: v3.7.0a1~2504
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20ae233d0270c6b2943df9602be7cf04247bb230;p=python

merge from 3.6
---

20ae233d0270c6b2943df9602be7cf04247bb230