From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 22 Oct 2015 07:27:44 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ab220ca6a9814830b52a5bdb7bcf2df58623ce5;p=python

Merge with 3.4
---

4ab220ca6a9814830b52a5bdb7bcf2df58623ce5