Translation fix
Merge branch 'milestone'
Merge branch 'milestone'
Changelog updated, version changed