Merge pull request #5184 from chipitsine/master
authorakallabeth <akallabeth@users.noreply.github.com>
Tue, 8 Jan 2019 08:13:52 +0000 (09:13 +0100)
committerGitHub <noreply@github.com>
Tue, 8 Jan 2019 08:13:52 +0000 (09:13 +0100)
cleanup minor issues found by cppcheck, coverity


Trivial merge