From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 23 Mar 2016 17:37:15 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~368^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c181cf44891cf4c18cd2e5d99a64599ce6745fb;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

4c181cf44891cf4c18cd2e5d99a64599ce6745fb