From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 21 Sep 2015 03:05:52 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1503
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3257b918926e79c229711b48f2ecffcf0b4834cb;p=python

Merge with 3.5
---

3257b918926e79c229711b48f2ecffcf0b4834cb