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

Merge with 3.4
---

2ceb55fbea1c7416dbb2a1647f72d29cf8b7723f