From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 30 Oct 2015 23:25:50 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f209b63f5c639a9413a32655bfd6f424675e399;p=python

Merge with 3.4
---

3f209b63f5c639a9413a32655bfd6f424675e399