From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 26 Sep 2015 02:23:33 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1442
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9cd90ccaae9d3a874db56ec8cb25bf8aec30a2ce;p=python

Merge with 3.5
---

9cd90ccaae9d3a874db56ec8cb25bf8aec30a2ce