Fix CppCheck error.
Merge branch 'master' into Viktor