Merge remote-tracking branch 'remotes/origin/master'
fixed soy's syntax highlight plugin config