From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 20 Sep 2015 18:18:58 +0000 (+0500)
Subject: merge 3.5 (#25145)
X-Git-Tag: v3.6.0a1~1508
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57b657931510957dad240d2d35243a8a7cef20c5;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#25145)
---

57b657931510957dad240d2d35243a8a7cef20c5