Merge pull request #3783 from chipitsine/master
authorakallabeth <akallabeth@users.noreply.github.com>
Mon, 20 Feb 2017 12:07:12 +0000 (13:07 +0100)
committerGitHub <noreply@github.com>
Mon, 20 Feb 2017 12:07:12 +0000 (13:07 +0100)
fix several defects found by cppcheck


Trivial merge