From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 20 Jul 2015 21:45:38 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1947
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f27a5cc434ac6e7c87438e899150ab42f3309cf;p=python

Merge with 3.5
---

5f27a5cc434ac6e7c87438e899150ab42f3309cf