From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 25 Oct 2016 06:00:18 +0000 (-0700)
Subject: merge 3.5 (#28525)
X-Git-Tag: v3.6.0b3~64
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=802883a386b30e4fdfd93dfef0dafa723fbeee15;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#28525)
---

802883a386b30e4fdfd93dfef0dafa723fbeee15