From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Sun, 13 Nov 2016 19:47:39 +0000 (+0100)
Subject: Merge 3.6
X-Git-Tag: v3.7.0a1~1998
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4bd0fe2e30827004a8283a1499e78c92ddb42a2;p=thirdparty%2FPython%2Fcpython.git

Merge 3.6
---

c4bd0fe2e30827004a8283a1499e78c92ddb42a2