From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 23 Sep 2015 07:45:33 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~285
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8509556c396013abb465ffb766162c51164d9b6;p=python

Merge with 3.4
---

e8509556c396013abb465ffb766162c51164d9b6