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

Merge 3.5.
---

e2cf9843841ce0cf26ea7e31070313e361f91611