From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 31 Jul 2015 01:16:44 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1875
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=746f6af7159ef2a8d0662b5dc88697e1574cf0b3;p=python

Merge with 3.5
---

746f6af7159ef2a8d0662b5dc88697e1574cf0b3