Merge "Fix syntax highlighting for javascript files"