From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 17 Aug 2015 01:54:58 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.6.0a1~1775^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac28169696aa0bbec2c11a860dbfb9e46056fef9;p=python

Merge with 3.4
---

ac28169696aa0bbec2c11a860dbfb9e46056fef9