Merge "Don't include CXX flags in CFLAGS" into devel/master