Merge branch 'release-0.6.0' into 'development'
Fix several translation errors
Release 0.6.1
Release 0.6.1.1