From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 5 Jan 2017 04:18:01 +0000 (-0500)
Subject: Merge with 3.6
X-Git-Tag: v3.7.0a1~1626
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85c1c9417831713bb286b491d5357b193fb6d732;p=python

Merge with 3.6
---

85c1c9417831713bb286b491d5357b193fb6d732