From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 8 Jan 2016 06:02:01 +0000 (-0800)
Subject: merge 3.4 (#26046)
X-Git-Tag: v3.6.0a1~812^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e95fd0b411f0fb8a1725ed46ace9fd483e9581e4;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#26046)
---

e95fd0b411f0fb8a1725ed46ace9fd483e9581e4