From: Yury Selivanov <yselivanov@sprymix.com>
Date: Sat, 30 May 2015 17:54:36 +0000 (-0400)
Subject: Issue 22357: Merge from 3.4
X-Git-Tag: v3.5.0b2~7^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=582b8c7629cda2bd8b0b445ea3a896a0aaea78eb;p=python

Issue 22357: Merge from 3.4
---

582b8c7629cda2bd8b0b445ea3a896a0aaea78eb