From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 11 Oct 2015 02:32:33 +0000 (-0700)
Subject: merge 3.4 (#25371)
X-Git-Tag: v3.5.1rc1~181
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5df40727c3bb24dbf38b74a6c1e0e2a6b70b429;p=python

merge 3.4 (#25371)
---

e5df40727c3bb24dbf38b74a6c1e0e2a6b70b429