From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 4 Aug 2014 16:34:57 +0000 (+0300)
Subject: #18034: merge with 3.4.
X-Git-Tag: v3.5.0a1~1126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48b8e4afd1177c1e9a8a5134f8c3bbae11b62004;p=python

#18034: merge with 3.4.
---

48b8e4afd1177c1e9a8a5134f8c3bbae11b62004