From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 28 May 2016 11:25:46 +0000 (+0300)
Subject: Merge heads (issue #25926).
X-Git-Tag: v3.6.0a2~214
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4a7fc9638241eec83e3b9b3878575f4bc36dc5c;p=python

Merge heads (issue #25926).
---

a4a7fc9638241eec83e3b9b3878575f4bc36dc5c