From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 9 Sep 2015 06:10:47 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1629
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29bdbd0270b64b6625be2c94240d2b0a233f8ea5;p=python

Merge with 3.5
---

29bdbd0270b64b6625be2c94240d2b0a233f8ea5