Merge branch 'master' into daywalker/cmake_editing