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

merge 3.5
---

4ce9e7a14ac776c61427c2a320e0a0f41f6eb123