From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 30 Jul 2015 20:44:41 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.6.0a1~1878^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=659fcb0a8dd1c3733c609406522d95aa663f2eaa;p=python

Merge with 3.4
---

659fcb0a8dd1c3733c609406522d95aa663f2eaa