Merge pull request #946 from sirupsen/solaris_build

Fix solaris build