From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 28 Sep 2015 08:53:01 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~254
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bcb0c134cb4824f1b6ceda4b35869b2333a1135b;p=python

Merge with 3.4
---

bcb0c134cb4824f1b6ceda4b35869b2333a1135b