Merge branch 'terminology-rieks' into 'master'

terminology updates (still WIP)

See merge request !3
3 jobs for master in 2 minutes and 49 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #41969
build

00:01:23

 
  Deploy
passed #41970
pages

00:01:25

passed pages:deploy

00:00:00