Merge pull request #1392 from alekseyshl/master

Fix build on Solaris.