From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 15 May 2016 18:20:13 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89d2a0394e6aad50b64779cce0096bab908ea84c;p=python

Merge with 3.5
---

89d2a0394e6aad50b64779cce0096bab908ea84c