From: Stefan Krah <skrah@bytereef.org>
Date: Tue, 10 Nov 2015 17:18:07 +0000 (+0100)
Subject: Merge 3.5.
X-Git-Tag: v3.6.0a1~1087
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3407cc26cb75db535fd0203ad30707e9e92c1957;p=python

Merge 3.5.
---

3407cc26cb75db535fd0203ad30707e9e92c1957