Sync with SVN
Merge remote-tracking branch 'upstream/master'
Translation update