Merge branch 'master' into bump_clang_version