From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 19 Oct 2016 22:46:38 +0000 (+0200)
Subject: Merge 3.6
X-Git-Tag: v3.7.0a1~2192
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=25a19247581d512b79e0f2a3e1bdaf56aaa92b6d;p=thirdparty%2FPython%2Fcpython.git

Merge 3.6
---

25a19247581d512b79e0f2a3e1bdaf56aaa92b6d