From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 11 Mar 2016 21:53:15 +0000 (+0100)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~498
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25caed546d1741063b3d4dce505d0d590fd473e3;p=python

Merge 3.5
---

25caed546d1741063b3d4dce505d0d590fd473e3