From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 22 Oct 2015 07:27:57 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5682850e1fc7eb83ba7672e23072152ecbafd08c;p=python

Merge with 3.5
---

5682850e1fc7eb83ba7672e23072152ecbafd08c