From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 12 Jun 2015 19:45:24 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~2078
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=679b723395516fef2c5ba3e17d69276662617919;p=python

Merge with 3.5
---

679b723395516fef2c5ba3e17d69276662617919