From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 16 Apr 2016 21:54:27 +0000 (-0700)
Subject: merge 3.5 (#26659)
X-Git-Tag: v3.6.0a1~188
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=259d247b3187150f2ea910beda65cbcd5b1a9a95;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#26659)
---

259d247b3187150f2ea910beda65cbcd5b1a9a95