Merge branch '2485-gdpr' into 'master'

Preparing for GDPR

See merge request !3
1 job for master in 1 minute and 19 seconds (queued for 1 minute and 12 seconds)
Status Job ID Name Coverage
  Test
passed #70298496
test

00:01:19