Merge branch 'terminology-rieks' into 'master'

Updates on Terminology (work-in-progress)

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

00:01:33

 
  Deploy
passed #42321
pages

00:01:30

passed pages:deploy

00:00:00