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

Merge with 3.4
---

73c2194d0715b463b4e6e7e32deb4eb513d563f5