Merge pull request #2866 from alexrp/solaris-10-tls