From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 24 Sep 2015 07:10:07 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1452
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac2d87a157845e78793fb6bc5421c7dbe04b2e27;p=python

Merge with 3.5
---

ac2d87a157845e78793fb6bc5421c7dbe04b2e27