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

Merge with 3.4
---

f5e0c41d6d143b16af4b9d97d5ce39eaa9e32df3