From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 27 Aug 2015 03:37:31 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.6.0a1~1731^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb3849c3947b43803c2dade2dc2064f07c958eed;p=python

Merge with 3.4
---

eb3849c3947b43803c2dade2dc2064f07c958eed