From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 18 Feb 2016 07:43:08 +0000 (-0800)
Subject: merge 3.5 (#26378)
X-Git-Tag: v3.6.0a1~601
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd8112901ae442413c77c8cf2f4ae42f6905565d;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#26378)
---

bd8112901ae442413c77c8cf2f4ae42f6905565d