From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 23 Sep 2015 07:52:36 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~284
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30d0433451918159278a611cd2d8627131da02f3;p=python

Merge with 3.4
---

30d0433451918159278a611cd2d8627131da02f3