Merge pull request #1496 from camporter/linux_compat_fixes