From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 1 Mar 2016 06:19:02 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~550
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8131f14de9d010358755c845babe6b1a63977aff;p=python

Merge with 3.5
---

8131f14de9d010358755c845babe6b1a63977aff