From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 10 Aug 2016 20:54:31 +0000 (-0400)
Subject: null merge from3.5
X-Git-Tag: v3.6.0a4~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40f70d1c057fb61eb24724950c237cd4b45a8cf5;p=python

null merge from3.5
---

40f70d1c057fb61eb24724950c237cd4b45a8cf5