From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 12 Nov 2015 20:03:30 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1074
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4df5c7aa30d4e8cc3542cff3d2a31c08fa16cbc5;p=python

Merge with 3.5
---

4df5c7aa30d4e8cc3542cff3d2a31c08fa16cbc5