From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 19 Sep 2016 06:44:02 +0000 (-0700)
Subject: merge 3.5 (#24022)
X-Git-Tag: v3.6.0b2~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5e8e8fc2b662bb6095c878b18acbf333f70b867;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#24022)
---

f5e8e8fc2b662bb6095c878b18acbf333f70b867