From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 16 Nov 2015 12:33:01 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1048
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8a6419d4e613b1753b2472273ef375f8b9bd3e5;p=python

Merge with 3.5
---

a8a6419d4e613b1753b2472273ef375f8b9bd3e5