Merge remote-tracking branch 'RW/master'
Updated translation to 417