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

Merge 3.5 (issue #25888)
---

d2dc15b26b03c03df664641fce544efa05588945