From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 30 Aug 2016 20:58:27 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0b1~518
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82f954691f531d9c94508f6c79c8e8400b205556;p=python

Merge with 3.5
---

82f954691f531d9c94508f6c79c8e8400b205556