From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 24 Sep 2015 05:39:48 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~282
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1749ce75429fd06749aedb3e5548996df8285827;p=python

Merge with 3.4
---

1749ce75429fd06749aedb3e5548996df8285827