From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 11 Mar 2016 20:31:02 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~503
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a55553d7e3f86d5f2475720823ec2ac7f944e3e6;p=python

Merge with 3.5
---

a55553d7e3f86d5f2475720823ec2ac7f944e3e6