Merge branch 'master' into '46-rewordings'

# Conflicts:
#   src/app/components/shared/login/login.component.html
#   src/assets/i18n/home/de.json
5 jobs for 46-rewordings
in 8 minutes and 18 seconds and was queued for 1 second