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

Merge with 3.5
---

99b80b507246af3c293a0aa8eeaac4788b703200