From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 30 Oct 2015 04:11:29 +0000 (-0700)
Subject: merge 3.5 (#25504)
X-Git-Tag: v3.6.0a1~1152
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e448066268973fdc04328ec8d0c32ebd6becc692;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#25504)
---

e448066268973fdc04328ec8d0c32ebd6becc692