Merge pull request #1124 from abarth/fix_build

Fix Linux build