From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 1 Mar 2016 06:13:21 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~551
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54f99500dd88ff850c9e5f45c79f45f405dea0c5;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

54f99500dd88ff850c9e5f45c79f45f405dea0c5