From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 4 Jun 2016 20:16:10 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a2~135^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64b8f6bcc86e836a97902b5d1fb59baee2bffc60;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

64b8f6bcc86e836a97902b5d1fb59baee2bffc60