Change the filetype path.
Merge branch 'master' into plugins