From: Stefan Krah <skrah@bytereef.org>
Date: Sun, 1 Feb 2015 18:19:49 +0000 (+0100)
Subject: Merge from 3.4.
X-Git-Tag: v3.5.0a1~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e6658b4a7e68c256a1a55ba4757076d44a8c43c;p=python

Merge from 3.4.
---

2e6658b4a7e68c256a1a55ba4757076d44a8c43c