From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 3 Oct 2015 03:25:54 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1337
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfc01028bbaa9ddc65462fe844724a3af4de8255;p=python

Merge with 3.5
---

bfc01028bbaa9ddc65462fe844724a3af4de8255