From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 26 Sep 2015 02:23:19 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~273
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58b07a605d7f5194df2978cfc81c598730dc84d6;p=python

Merge with 3.4
---

58b07a605d7f5194df2978cfc81c598730dc84d6