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

Merge with 3.5
---

f6f5dbfb1f6aee1fa6a684402111c8088f8398f1