From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Fri, 28 Oct 2016 09:37:17 +0000 (+0200)
Subject: Merge heads.
X-Git-Tag: v3.7.0a1~2113
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01dfb6c72d09c3f2a905c720f820d19a52cbbb62;p=python

Merge heads.
---

01dfb6c72d09c3f2a905c720f820d19a52cbbb62