From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 14 Oct 2015 02:04:22 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1230
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8533a2111727d41fb86ce88148cd1699136c57f9;p=python

Merge with 3.5
---

8533a2111727d41fb86ce88148cd1699136c57f9