From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 1 Aug 2015 23:15:28 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1862
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8efb76fb396eb68b1e8f97971599b8f9a4379f6a;p=python

Merge with 3.5
---

8efb76fb396eb68b1e8f97971599b8f9a4379f6a