From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 14 Oct 2015 02:09:34 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1229
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c737d280b52906cbb09fc53b70a7ff2098621be;p=python

Merge with 3.5
---

8c737d280b52906cbb09fc53b70a7ff2098621be