From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 7 Sep 2015 05:58:43 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1649
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5dc29f2614b1e3c818e3200ba54c747cb34cc8ab;p=python

Merge with 3.5
---

5dc29f2614b1e3c818e3200ba54c747cb34cc8ab