Merge branch 'ab/clang-lints' into maint-1.7.7