From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 28 Oct 2016 17:15:08 +0000 (+0200)
Subject: Merge 3.6
X-Git-Tag: v3.7.0a1~2111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e03d8cc1236083747ff374e68d2abc199fb942f;p=python

Merge 3.6
---

1e03d8cc1236083747ff374e68d2abc199fb942f