From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 4 Feb 2016 06:24:56 +0000 (-0500)
Subject: Merge 3.5 (issue #25660)
X-Git-Tag: v3.6.0a1~654
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aecef0d2d5962d3f79383e307a7469df783e7357;p=python

Merge 3.5 (issue #25660)
---

aecef0d2d5962d3f79383e307a7469df783e7357