Merge branch 'master' into develop
Fixed incorrect textdomain
Version bump
Merge branch 'develop'