From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 21 Sep 2015 00:03:37 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1505
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f746e79fa9befeccab1e77e625a776d7e55147c;p=python

Merge with 3.5
---

3f746e79fa9befeccab1e77e625a776d7e55147c