Translation bug
Merge branch 'release/7.x-0.4' into develop
Merge branch 'feature/1092-translation-bug' into develop
Tagging version 7.x-0.5
Merge branch 'release/7.x-0.5'