From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 25 Aug 2016 05:22:44 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0b1~549
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=664759cf19497b65f4c8ece4dd194e1c2beb73f1;p=python

Merge with 3.5
---

664759cf19497b65f4c8ece4dd194e1c2beb73f1