Terminology update (Rieks)

Rieks Joostenrequested to merge
terminology-rieks into master

Merge request reports