Merge branch 'terminology-rieks' into 'master'

Another test to see if deployment of pages works

See merge request !39
1 job for master in 1 minute and 59 seconds (queued for 9 seconds)