From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 5 Sep 2016 21:03:08 +0000 (-0700)
Subject: merge 3.5 (#27957)
X-Git-Tag: v3.6.0b1~464
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=942dd9f3f77eef08fabddbd9fb883a866ad6d4cb;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#27957)
---

942dd9f3f77eef08fabddbd9fb883a866ad6d4cb