Merge branch 'master' into feature/stabilization
Merge branch 'master' into feature/stabilization
Crowdin injection w3 - Add Norwegian file on 20140116
Merge branch 'feature/stabilization'