From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 17 Aug 2015 01:55:13 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1775
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92491af4e5d6480947803116a9c159e155cc4c3d;p=python

Merge with 3.5
---

92491af4e5d6480947803116a9c159e155cc4c3d