From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 10 May 2016 06:44:30 +0000 (-0700)
Subject: merge 3.5 (#26986)
X-Git-Tag: v3.6.0a1~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4dfbe608fb52191b435c5545e8a343586887135;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#26986)
---

a4dfbe608fb52191b435c5545e8a343586887135