From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 7 Aug 2014 00:28:26 +0000 (+0300)
Subject: #22092: merge with 3.4.
X-Git-Tag: v3.5.0a1~1106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=869778e520a6bdf0d76e9f9e62fec2554d832f8b;p=python

#22092: merge with 3.4.
---

869778e520a6bdf0d76e9f9e62fec2554d832f8b