From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 4 Nov 2015 06:43:52 +0000 (-0800)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~1127
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c3a5f24c36d4436e615e362ffaf0403cab6c1d3;p=thirdparty%2FPython%2Fcpython.git

merge 3.5
---

4c3a5f24c36d4436e615e362ffaf0403cab6c1d3