From: Ned Deily <nad@python.org>
Date: Mon, 12 Sep 2016 21:38:45 +0000 (-0400)
Subject: Merge with 3.6
X-Git-Tag: v3.7.0a1~2521
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1191923ad443f13382fbb89c18a5ed9daa59fbf;p=python

Merge with 3.6
---

b1191923ad443f13382fbb89c18a5ed9daa59fbf