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

Merge with 3.5
---

2f557be2f511dbe15f58fb71d7adb5cb5742f877