From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 3 Sep 2015 02:08:21 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1694
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0fa5ef72b731c6884f58c0aa38f648b57004c4db;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

0fa5ef72b731c6884f58c0aa38f648b57004c4db