From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Fri, 28 Oct 2016 09:40:47 +0000 (+0200)
Subject: Merge heads.
X-Git-Tag: v3.6.0b3~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbcb79920b0e220c2e1b0e77db5aca2f3a2a52d4;p=python

Merge heads.
---

bbcb79920b0e220c2e1b0e77db5aca2f3a2a52d4