From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 6 Aug 2015 18:04:12 +0000 (-0400)
Subject: Merge 3.4 (issue #23812)
X-Git-Tag: v3.6.0a1~1821^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e03f42717cc7e2bab2fc03b72d17a558757060e4;p=python

Merge 3.4 (issue #23812)
---

e03f42717cc7e2bab2fc03b72d17a558757060e4