From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 12 Jan 2016 09:27:58 +0000 (+0200)
Subject: #26001: merge with 3.5.
X-Git-Tag: v3.6.0a1~786
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b06558769e23bd91d7dbb88dbfb6b5ed6e0054a;p=python

#26001: merge with 3.5.
---

2b06558769e23bd91d7dbb88dbfb6b5ed6e0054a