From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 27 Sep 2015 08:40:23 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~263^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a9cee1510d0d9b173dda36bdce767774796b731;p=python

Merge with 3.4
---

6a9cee1510d0d9b173dda36bdce767774796b731