From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 6 Jan 2017 17:16:07 +0000 (+0100)
Subject: Merge 3.6
X-Git-Tag: v3.7.0a1~1616
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd992bbe73dbbca356a94cf920f55012e5db689e;p=python

Merge 3.6
---

cd992bbe73dbbca356a94cf920f55012e5db689e