From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 4 Oct 2015 04:31:36 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1328
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04cbe08be414ec718ecb39ee124ee41eb398726d;p=python

Merge with 3.5
---

04cbe08be414ec718ecb39ee124ee41eb398726d