Commit 1fa142c6 authored by Rieks Joosten's avatar Rieks Joosten

Merge branch 'terminology-rieks' into 'master'

Terminology updates (work-in-progress)

See merge request !11
parents 1babdc8f 8fb4d3b1
Pipeline #16895 passed with stages
in 5 minutes and 36 seconds