From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 9 Jan 2016 14:09:19 +0000 (+0200)
Subject: #24789: merge with 3.5.
X-Git-Tag: v3.6.0a1~807
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef7851b89193f9c18ee0e0624435a7fd9ace121f;p=python

#24789: merge with 3.5.
---

ef7851b89193f9c18ee0e0624435a7fd9ace121f