From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 18 Aug 2015 06:38:46 +0000 (-0700)
Subject: merge 3.4 (#24883)
X-Git-Tag: v3.6.0a1~1766^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e205f7b4f852d903db223d98b96721c4bc19644;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#24883)
---

8e205f7b4f852d903db223d98b96721c4bc19644