From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 4 Sep 2015 08:18:11 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1674
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1320f08b408093324be54fb078c45178289d18fb;p=python

Merge with 3.5
---

1320f08b408093324be54fb078c45178289d18fb