Merge branch 'terminology-rieks' into 'master'

Terminology rieks = update (still wip)

See merge request !9
3 jobs for master in 5 minutes and 44 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed build #44894

00:03:10

 
  Deploy
passed pages #44895

00:02:34

passed pages:deploy

00:00:01