From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 28 Oct 2014 11:58:47 +0000 (+0100)
Subject: #22237: merge with 3.4.
X-Git-Tag: v3.5.0a1~609
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7d19fe93b5f6f085a1be03242e72ecb187cdc06;p=python

#22237: merge with 3.4.
---

a7d19fe93b5f6f085a1be03242e72ecb187cdc06