Fixed file type detection for C++ at work.
Merge branch 'master' into linux