From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 18 Aug 2015 17:27:30 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1760
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a8dc5899836ecc4020395b35daebe2cfbdf11ef;p=python

Merge with 3.5
---

4a8dc5899836ecc4020395b35daebe2cfbdf11ef