Fix compilation on Linux.
Merge branch 'master' into buildsystem