From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 26 Sep 2015 22:50:58 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1434
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c2982a25c01752d0969435afe8ce61ac48eb4ee;p=python

Merge with 3.5
---

9c2982a25c01752d0969435afe8ce61ac48eb4ee