From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 6 Sep 2016 17:06:51 +0000 (-0700)
Subject: merge 3.5 (#27969)
X-Git-Tag: v3.6.0b1~427
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45c7514de406d9ed84e46d80500fb4ac87a94ea8;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#27969)
---

45c7514de406d9ed84e46d80500fb4ac87a94ea8