Merge heads (issue #25926).
authorSerhiy Storchaka <storchaka@gmail.com>
Sat, 28 May 2016 11:25:46 +0000 (14:25 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Sat, 28 May 2016 11:25:46 +0000 (14:25 +0300)

Trivial merge