From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 21 Sep 2015 05:44:20 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~313
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4950d875a6d42a910cbbe0e3f9aca2dea206106;p=python

Merge with 3.4
---

a4950d875a6d42a910cbbe0e3f9aca2dea206106