From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 6 Aug 2015 18:04:30 +0000 (-0400)
Subject: Merge 3.5 (issue #23812)
X-Git-Tag: v3.6.0a1~1821
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1720e1fc0bf26b55ce7f807069f292f09a18cd64;p=python

Merge 3.5 (issue #23812)
---

1720e1fc0bf26b55ce7f807069f292f09a18cd64