From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 24 Sep 2015 21:32:50 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1448
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c62656d37a4a1b58783e3cb3ca6871032aa81d96;p=python

Merge with 3.5
---

c62656d37a4a1b58783e3cb3ca6871032aa81d96