From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 21 Nov 2015 00:37:14 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1015
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20fe98350eef84537183e4e778bf6a1b0e289d8a;p=python

Merge with 3.5
---

20fe98350eef84537183e4e778bf6a1b0e289d8a