Merge branch 'matomo' into 'master'

Matomo

See merge request !7
2 jobs for v2.1.4 in 1 minute and 50 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Build
passed #6016
build

00:01:50

manual #6017
allowed to fail manual
build_shopmason