From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 27 Aug 2015 17:02:47 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1730
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54f0e197662c37ddbccd47f959ee987a72a27378;p=python

Merge with 3.5
---

54f0e197662c37ddbccd47f959ee987a72a27378