Merge pull request #2910 from cptjazz/compiler_warnings