From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 18 Mar 2016 18:11:30 +0000 (+0200)
Subject: #26250: merge with 3.5.
X-Git-Tag: v3.6.0a1~442
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6840632ef2aec4210ab456900c3bd96aef4579d8;p=python

#26250: merge with 3.5.
---

6840632ef2aec4210ab456900c3bd96aef4579d8