Merge branch 'master' into cmake_build