From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 7 Sep 2015 05:58:29 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.6.0a1~1649^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffcff22ade25f8ef701bd4d7a1e72e1337abbd3a;p=python

Merge with 3.4
---

ffcff22ade25f8ef701bd4d7a1e72e1337abbd3a