From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 31 Jul 2015 01:16:29 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.6.0a1~1875^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b20ac4df842380e48e4db1830c7c14fab34f6435;p=python

Merge with 3.4
---

b20ac4df842380e48e4db1830c7c14fab34f6435