From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 4 Jan 2017 11:02:30 +0000 (+0100)
Subject: Merge 3.6
X-Git-Tag: v3.7.0a1~1629
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11edf29025d86ce9bca56bba88004e4930a717af;p=python

Merge 3.6
---

11edf29025d86ce9bca56bba88004e4930a717af