From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 12 Jun 2015 20:48:30 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~2074
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=160849444ef5871c118c09f452bf079bc6ec5015;p=python

Merge with 3.5
---

160849444ef5871c118c09f452bf079bc6ec5015