From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 20 Apr 2016 16:26:40 +0000 (+0200)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~153
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af1baabfce5efb5c48970942cd0be0832d0d0ed9;p=python

Merge 3.5
---

af1baabfce5efb5c48970942cd0be0832d0d0ed9