From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 24 Sep 2015 05:40:07 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1454
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51c0f3e451a0cde2d7c22bff3c3554957518b50f;p=python

Merge with 3.5
---

51c0f3e451a0cde2d7c22bff3c3554957518b50f