From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 15 May 2016 05:31:01 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d3f7e8b41a8b1f47e40aed5696413b167166998;p=python

Merge with 3.5
---

3d3f7e8b41a8b1f47e40aed5696413b167166998