From: Stefan Krah <skrah@bytereef.org>
Date: Wed, 3 Aug 2016 09:18:54 +0000 (+0200)
Subject: Merge 3.5.
X-Git-Tag: v3.6.0a4~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d60c56e7e37cf7ef94ffd9591cf803351c33cfa;p=python

Merge 3.5.
---

0d60c56e7e37cf7ef94ffd9591cf803351c33cfa