Merge branch 'clang-fixes'