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

#19006: merge with 3.5.
---

997e6c1dd854cc35870525a0d434d9b01b6715d3