From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 12 Oct 2015 02:08:02 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1248
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e6d7a524db8ab64719c6ecdb856022ec602fbf4;p=python

Merge with 3.5
---

9e6d7a524db8ab64719c6ecdb856022ec602fbf4