From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 11 Jan 2016 21:31:38 +0000 (+0200)
Subject: #25991: merge with 3.5.
X-Git-Tag: v3.6.0a1~791
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4d4f20284a098f4bad2958d5a72cfd9033f8b08;p=python

#25991: merge with 3.5.
---

d4d4f20284a098f4bad2958d5a72cfd9033f8b08