From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 21 Jan 2016 06:03:00 +0000 (-0800)
Subject: merge 3.5 (#26172)
X-Git-Tag: v3.6.0a1~727
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e45abae08f5513e6c4061a04199d67f13745ffa7;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#26172)
---

e45abae08f5513e6c4061a04199d67f13745ffa7