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

Merge with 3.5
---

1b90af21de3e38690b4ead2a31065594abaa894c