From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 4 Sep 2015 08:38:17 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.6.0a1~1672^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f5bf0203facfb2df142642040825449634b5422;p=python

Merge with 3.4
---

9f5bf0203facfb2df142642040825449634b5422