From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 6 Sep 2015 18:49:48 +0000 (+0300)
Subject: #23144: merge with 3.5.
X-Git-Tag: v3.6.0a1~1655
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=564cf7b62ced76a3cc87b16a8a278f0612673690;p=python

#23144: merge with 3.5.
---

564cf7b62ced76a3cc87b16a8a278f0612673690