From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 25 Sep 2015 04:49:44 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1445
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5bb6f3a59044aaa137a10da0a4fa9ae6a62020f;p=python

Merge with 3.5
---

b5bb6f3a59044aaa137a10da0a4fa9ae6a62020f