From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 18 Dec 2015 20:47:28 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~885
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de20bad224c61ee68f09bd4281b6bdf5fcac5e1c;p=python

Merge with 3.5
---

de20bad224c61ee68f09bd4281b6bdf5fcac5e1c