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

merge 3.5 (#27968)
---

9d2617bec001250781d26625f73907372832b8a7