From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 30 Oct 2015 23:41:41 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1148
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7003696d5db4963bb1cf86ab4e32118ebb266d17;p=python

Merge with 3.5
---

7003696d5db4963bb1cf86ab4e32118ebb266d17