From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 3 Aug 2015 22:43:50 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.6.0a1~1850^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b64354e1498e6b058d6445b7a9f7bad36d96c28;p=python

Merge with 3.4
---

0b64354e1498e6b058d6445b7a9f7bad36d96c28