From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 4 Oct 2016 07:00:23 +0000 (-0700)
Subject: merge 3.5 (#26617)
X-Git-Tag: v3.6.0b2~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=804480912c8328df7d042c6e5201cfe4abf21742;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#26617)
---

804480912c8328df7d042c6e5201cfe4abf21742