From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 30 Jul 2015 20:44:55 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1878
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd111d5af89cb20f671498bb8ae6cbd4a43dfde4;p=python

Merge with 3.5
---

cd111d5af89cb20f671498bb8ae6cbd4a43dfde4