From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 13 Sep 2016 05:07:14 +0000 (-0700)
Subject: merge 3.5 (#27981)
X-Git-Tag: v3.6.0b2~234
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a715cfc57e242b93c5c5e8ad2443ee276b3e6fc;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#27981)
---

5a715cfc57e242b93c5c5e8ad2443ee276b3e6fc