From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 21 Nov 2015 05:05:35 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1014
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=266b276f34db5cc106d100f63b631af1f1f8e0e2;p=python

Merge with 3.5
---

266b276f34db5cc106d100f63b631af1f1f8e0e2