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

Merge with 3.4
---

dc22031a61184009f4a3bd030d7042fb0c259569