From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 17 Jan 2016 04:44:16 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~755
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab061cf2aec2bd1440066dc5238e95d3aee7fd9f;p=python

Merge with 3.5
---

ab061cf2aec2bd1440066dc5238e95d3aee7fd9f