Merge branch 'master-update' into 'master'

Master update

See merge request !131
3 jobs for !132 with master in 31 seconds (queued for 1 second)
latest detached
Status Job ID Name Coverage
  Build
passed #472798
build-www3-dev

00:00:12

 
  Review
passed #472799
review_tuhh

00:00:09

passed #472800
manual
review_tuhh:stop

00:00:10