From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 23 Sep 2015 01:11:06 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1470
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f1f091e80d790f338d2225b017d2d2cf9123af7;p=python

Merge with 3.5
---

6f1f091e80d790f338d2225b017d2d2cf9123af7