From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 21 Sep 2015 00:03:22 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~320
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1de516e1df0b451c15b0c449e80c3632783ed2fc;p=python

Merge with 3.4
---

1de516e1df0b451c15b0c449e80c3632783ed2fc