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

Merge with 3.5
---

3acf1708690b9b8c7bb41337498b11eff0166c92