From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 9 Sep 2016 19:46:49 +0000 (-0700)
Subject: merge 3.5 (#28051)
X-Git-Tag: v3.6.0b1~183
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84f6a8f725c0f7a06d5e77b283d6028bf854443c;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#28051)
---

84f6a8f725c0f7a06d5e77b283d6028bf854443c