Merge pull request #3207 from dago/cppflagsbugs