Fixed build on Linux
Merge branch 'master' into travis-cpp