Merge branch 'feature/german-locale' into fixes