From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Sun, 13 Nov 2016 18:42:09 +0000 (+0100)
Subject: Merge 3.6
X-Git-Tag: v3.7.0a1~1999
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=daa9e239f0cd149bc1f3a52098aa666d3b2cd770;p=python

Merge 3.6
---

daa9e239f0cd149bc1f3a52098aa666d3b2cd770