Merged with cppcheck 1.64 released version