Merge branch 'develop' into 'master'

Need cron to run...cron

See merge request !2
3 jobs for master in 1 minute and 27 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #6656
lint:dockerfile

00:00:19

passed #6657
lint:shell-script

00:01:27

 
  Deploy
manual #6658
allowed to fail manual
build:master