From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 3 Aug 2015 22:44:20 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1850
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0758d704b8053619a523de251214b7b83ca7b4be;p=python

Merge with 3.5
---

0758d704b8053619a523de251214b7b83ca7b4be