From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Sun, 13 Nov 2016 18:41:07 +0000 (+0100)
Subject: Merge 3.5
X-Git-Tag: v3.6.0b4~93
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f056b04eea2363309990916e653704a4c6c10b81;p=python

Merge 3.5
---

f056b04eea2363309990916e653704a4c6c10b81