From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 20 Sep 2015 23:57:37 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~321
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47f9741e5cc08a5f4e2d24fb62388afa18b30a8c;p=python

Merge with 3.4
---

47f9741e5cc08a5f4e2d24fb62388afa18b30a8c