From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 23 Apr 2016 06:43:24 +0000 (-0700)
Subject: merge 3.5 (#26827)
X-Git-Tag: v3.6.0a1~146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9046df065992c1763d92ed71882e3a45c8fb7437;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#26827)
---

9046df065992c1763d92ed71882e3a45c8fb7437