From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 27 Sep 2015 08:40:34 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1425^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89171f207817ab805470bfe5b5915316f467d2b2;p=python

Merge with 3.5
---

89171f207817ab805470bfe5b5915316f467d2b2