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

Merge with 3.5
---

8ce85b5f578c3e1cb0ec8c20300007448b9a83db