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

Merge with 3.5
---

c0a732e901733c669df67cc58ad2c8010138ca6f