From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 3 Jan 2017 22:47:39 +0000 (+0100)
Subject: Merge 3.6
X-Git-Tag: v3.7.0a1~1630
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12bc0274a8953d6b6a22b6fabc2e6bb9323bd03d;p=python

Merge 3.6
---

12bc0274a8953d6b6a22b6fabc2e6bb9323bd03d