From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 16 May 2016 03:53:10 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31e59aa7a2968848330a995f05fc47665d1944f2;p=python

Merge with 3.5
---

31e59aa7a2968848330a995f05fc47665d1944f2