Merge pull request #3022 from rubenk/treewide-fix-some-style-issues