From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 20 Sep 2015 06:34:51 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1509
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5cdc9e1b37678ab4f8b4c986abb993d343badd19;p=python

Merge with 3.5
---

5cdc9e1b37678ab4f8b4c986abb993d343badd19