Merge branch 'ab/clang-lints'