From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 6 Sep 2016 22:54:38 +0000 (-0700)
Subject: merge 3.5
X-Git-Tag: v3.6.0b1~393^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0cf223873e568e40ebf813bb4d5d78536bf53338;p=thirdparty%2FPython%2Fcpython.git

merge 3.5
---

0cf223873e568e40ebf813bb4d5d78536bf53338