Used cpp11 for header files too.
Merge branch 'master' into linux