Replacing clang by clang++ fixing burning compilation error
Merge branch 'hotfix' into dev