From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 14 May 2015 22:11:14 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0b1~135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8aad7f27a4fe285bee9cfc253c374bb611230247;p=python

Merge with 3.4
---

8aad7f27a4fe285bee9cfc253c374bb611230247