Merge branch 'cppcheck'