Merge branch 'terminology-rieks' into 'master'

Terminology updates (work-in-progress)

See merge request !11
3 jobs for master in 5 minutes and 36 seconds
Status Job ID Name Coverage
  Build
passed #45934
build

00:02:52

 
  Deploy
passed #45935
pages

00:02:43

passed pages:deploy

00:00:01