From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 14 Aug 2015 21:00:12 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1789
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa02bc0d3fed688ec7ac48679a9d03cd3d0fad0e;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

fa02bc0d3fed688ec7ac48679a9d03cd3d0fad0e