From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 17 May 2016 02:28:00 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a2~284
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef20cbfb329df66ea2b69373968d49589df988b1;p=python

Merge with 3.5
---

ef20cbfb329df66ea2b69373968d49589df988b1