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

Merge with 3.5
---

3a03a1cb00e7286565d6b51023b0bc767edb6afc