From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 24 Nov 2016 21:31:25 +0000 (+0100)
Subject: Merge 3.6
X-Git-Tag: v3.7.0a1~1885
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbff9b3f0453c312de1c8aa77324c5b72937f9ec;p=python

Merge 3.6
---

fbff9b3f0453c312de1c8aa77324c5b72937f9ec