From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 27 Aug 2015 03:37:47 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1731
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae6a75617f4a4196bac4df4f42d3cc04280eb14b;p=python

Merge with 3.5
---

ae6a75617f4a4196bac4df4f42d3cc04280eb14b