From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 7 Sep 2016 16:00:57 +0000 (-0700)
Subject: merge 3.5 (closes #27968)
X-Git-Tag: v3.6.0b1~346
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c75abff53375bbd9f1536de4069854cea4933c42;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (closes #27968)
---

c75abff53375bbd9f1536de4069854cea4933c42