From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Thu, 8 Dec 2016 11:21:53 +0000 (+0100)
Subject: Issue #26941: Merge 3.6.
X-Git-Tag: v3.7.0a1~1810
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4341113321b6ea45d2c9f2f1d6fb3790480e446;p=python

Issue #26941: Merge 3.6.
---

f4341113321b6ea45d2c9f2f1d6fb3790480e446