From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 3 Oct 2015 02:12:39 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~221
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4401760a6cf1963d5315fcd578fd6637970d32a2;p=python

Merge with 3.4
---

4401760a6cf1963d5315fcd578fd6637970d32a2