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