Attempt to fix crashs when self-checking cppcheck introduced by previous commit
Merge branch 'master' into travis_gcc_testsuite