From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 27 Dec 2016 05:05:41 +0000 (-0500)
Subject: Merge with 3.6
X-Git-Tag: v3.7.0a1~1683
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=241dc9c454320128dbb2857ae417c7a1c9608f92;p=python

Merge with 3.6
---

241dc9c454320128dbb2857ae417c7a1c9608f92