From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 23 Sep 2015 07:45:49 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1464
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e02348c7eae8844877b9fe44113e46c443fad77;p=python

Merge with 3.5
---

2e02348c7eae8844877b9fe44113e46c443fad77