- Fix linux compilation.
Merge branch 'linux'