From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 27 Jan 2016 16:01:13 +0000 (+0100)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~690
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b96f17b1c30b14bd1c017504e7b6df17e1ad961;p=python

Merge 3.5
---

5b96f17b1c30b14bd1c017504e7b6df17e1ad961