From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 1 Jul 2015 01:19:00 +0000 (-0400)
Subject: Merge 3.5 (Issue #24400)
X-Git-Tag: v3.6.0a1~2025
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17314ab4dcde8a458feea93d39ecd4cec042cd1f;p=python

Merge 3.5 (Issue #24400)
---

17314ab4dcde8a458feea93d39ecd4cec042cd1f