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

Merge with 3.4
---

103d06c81e0dcf57673072cedeedcffb2f3e73cc