From: Stefan Krah <skrah@bytereef.org>
Date: Thu, 2 Jul 2015 18:28:45 +0000 (+0200)
Subject: Merge from 3.5 (#24543).
X-Git-Tag: v3.6.0a1~2015
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c8ccff3251829ebcc85294a61d53cf342093403;p=python

Merge from 3.5 (#24543).
---

0c8ccff3251829ebcc85294a61d53cf342093403