From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 27 Jan 2016 16:52:13 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~689
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0110dfc523076f6dee7e06332ce7a273acc03815;p=python

Merge with 3.5
---

0110dfc523076f6dee7e06332ce7a273acc03815