From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 21 Sep 2015 02:56:03 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1504
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca5d6ecf0a66c14a9d93d9242741118f53cf70f9;p=python

Merge with 3.5
---

ca5d6ecf0a66c14a9d93d9242741118f53cf70f9