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

Merge with 3.4
---

1ccf44c4766644e64c183c0b1dbf00ca76f847cc