From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 11 Jan 2016 22:09:43 +0000 (+0200)
Subject: #25517: merge with 3.5.
X-Git-Tag: v3.6.0a1~790
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d377712927c957c38f2a4fa96d61b7eb0e0dbca;p=python

#25517: merge with 3.5.
---

1d377712927c957c38f2a4fa96d61b7eb0e0dbca