From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 24 Sep 2015 07:09:56 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~280
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5901b001244c9ce254f3a00a8a9f8f39747d282f;p=python

Merge with 3.4
---

5901b001244c9ce254f3a00a8a9f8f39747d282f