Merge pull request #10803 from Zopolis4/clangingaround Resolve additional warnings generated by clang
