From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 2 Mar 2016 16:08:05 +0000 (-0500)
Subject: Merge 3.5 (issue #26347)
X-Git-Tag: v3.6.0a1~538
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06495ffe93ce05840c42fbb31b56036c613a4656;p=python

Merge 3.5 (issue #26347)
---

06495ffe93ce05840c42fbb31b56036c613a4656