Fix linux build.
Merge pull request #842 from eiriksm/fix_linux_build

Fix linux build.