(Logger) Avoid a warning with gcc/clang
Merge branch 'master' into static_build_fix