From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Tue, 13 Sep 2016 16:06:08 +0000 (+0200)
Subject: Merge from 3.6.
X-Git-Tag: v3.7.0a1~2503
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e689877926141b4dc557681a7285bba8fe71a30;p=python

Merge from 3.6.
---

1e689877926141b4dc557681a7285bba8fe71a30