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

Merge 3.5 (issue #26221)
---

a8ac8e336bcce0c890d171a019589f89f36dfdd5