From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 20 Nov 2015 07:50:17 +0000 (+0100)
Subject: Merge 3.5 (issue #25670)
X-Git-Tag: v3.6.0a1~1026
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c50ec007ff1b08fd2677bdd1d785b0e0af2588df;p=python

Merge 3.5 (issue #25670)
---

c50ec007ff1b08fd2677bdd1d785b0e0af2588df