Merge branch 'development' into 'master'

Matomo and Maps Hotfix

See merge request !9
2 jobs for v2.2.2 in 1 minute and 50 seconds