Merge branch 'terminology-rieks' into 'master'

retry merge

See merge request !37
1 job for master in 1 minute and 51 seconds (queued for 2 seconds)