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

Merge with 3.4
---

e9cd1d3c69b0d524a4b889a1dfc694a1f1c4ac20