From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 4 Nov 2015 06:42:35 +0000 (-0800)
Subject: merge 3.4
X-Git-Tag: v3.5.1rc1~98
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1897c9860ade900b7cb94c8be86f5fdb310bcc2f;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

1897c9860ade900b7cb94c8be86f5fdb310bcc2f