From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 27 Sep 2015 00:04:23 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1433
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0103af397ff59a2feab21b954087a657201d37f7;p=python

Merge with 3.5
---

0103af397ff59a2feab21b954087a657201d37f7