Merge pull request #1171 from Diapolo/fix_compiler_warn