Merge branch 'develop' into 'master'

Minor changes

See merge request !8
2 jobs for master in 2 minutes and 28 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Test
passed #28369
docker
test

00:01:58

 
  Deploy
passed #28370
docker
deploy

00:00:30