Merge branch 'hotfix/fix_typo_again'
Merge branch 'master' of github.com:marcus-herrmann/FlagPages into develop