Merge branch 'bw/git-clang-format'