From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 30 Oct 2015 06:47:48 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6d17c04bc94c690e9636cd6eb9b7a16f0496836;p=python

Merge with 3.5
---

c6d17c04bc94c690e9636cd6eb9b7a16f0496836