Merge branch 'feature/l10n' into develop
Merge branch 'feature/testgit' into develop
Merge branch 'release/v0.3'