修改语言类型标示
Merge remote-tracking branch 're/master'