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

#18588: merge with 3.4.
---

b398d3e4415291cd3fc779c1b49b10c5e39cde50