From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 24 Aug 2016 21:53:16 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0b1~559
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c532b3c1cebdbdb2aac8dc3d2be3904d754aee9c;p=python

Merge with 3.5
---

c532b3c1cebdbdb2aac8dc3d2be3904d754aee9c