Merge branch 'develop'
Bump version
Fix changelog
Update translation of markings
Update changelog