From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 12 Jan 2016 02:05:18 +0000 (-0500)
Subject: Merge 3.5 (issue #25486)
X-Git-Tag: v3.6.0a1~789
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9179c40a9ff74978b4226f42b8aa0c2ef625556c;p=python

Merge 3.5 (issue #25486)
---

9179c40a9ff74978b4226f42b8aa0c2ef625556c