From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 23 Sep 2015 03:00:07 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1466
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39677a4088e72b62b35fe4c5ff563c5f1f8ff00c;p=python

Merge with 3.5
---

39677a4088e72b62b35fe4c5ff563c5f1f8ff00c