Merge pull request #4962 from akallabeth/wextra_fixes
authorBernhard Miklautz <bmiklautz@users.noreply.github.com>
Mon, 29 Oct 2018 10:26:04 +0000 (10:26 +0000)
committerGitHub <noreply@github.com>
Mon, 29 Oct 2018 10:26:04 +0000 (10:26 +0000)
Wextra fixes


Trivial merge