From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 30 Oct 2015 23:26:03 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4df429618de4b94519b453637e1eee9538d85d18;p=python

Merge with 3.5
---

4df429618de4b94519b453637e1eee9538d85d18