From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 12 Nov 2015 20:03:17 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e19f3ec07228aeaa9bd1379413a3054953a5c51e;p=python

Merge with 3.4
---

e19f3ec07228aeaa9bd1379413a3054953a5c51e