From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 20 Nov 2015 17:22:18 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1022
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b74a707cbd3f2efbb899fe67ee63402433ed3d8e;p=python

Merge with 3.5
---

b74a707cbd3f2efbb899fe67ee63402433ed3d8e