Merge branch 'release/7.x-0.5' into develop
Translation bug fix
Tagging version 7.x-0.6
Merge branch 'release/7.x-0.6'