Merge branch 'jk/clang-pedantic'