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

Merge with 3.5
---

e6073944b65efc13731c73c044cee18af1b64d44