From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 12 Nov 2015 20:06:34 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1073
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9fc40918022c05d2fec68b5b9aa10a7578f6b6e0;p=python

Merge with 3.5
---

9fc40918022c05d2fec68b5b9aa10a7578f6b6e0