From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 2 May 2016 22:30:19 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=478be14ec0a2ae44e6ab78ed79ea8d238581a4d2;p=python

Merge with 3.5
---

478be14ec0a2ae44e6ab78ed79ea8d238581a4d2