From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Thu, 15 Dec 2016 20:01:52 +0000 (+0100)
Subject: Merge 3.6.
X-Git-Tag: v3.7.0a1~1743
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31eaf49ed93e725ba84e17156b90c785ca8ecb4c;p=python

Merge 3.6.
---

31eaf49ed93e725ba84e17156b90c785ca8ecb4c