Merge branch 'terminology-rieks' into 'master'

Terminology updates (work in progress)

See merge request !10
3 jobs for master in 3 minutes and 27 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed build #45869

00:02:01

 
  Deploy
passed pages #45870

00:01:25

passed pages:deploy

00:00:01