From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 24 Sep 2015 00:00:55 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~283
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0389fccbd0f09ecbbf317e1926c27a771f769432;p=python

Merge with 3.4
---

0389fccbd0f09ecbbf317e1926c27a771f769432