From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 12 Nov 2015 20:25:07 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1072
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbc741c729bb6abe344662f75ebe80b4251b2217;p=python

Merge with 3.5
---

fbc741c729bb6abe344662f75ebe80b4251b2217