Merge branch 'develop' into 'master'

Develop

See merge request !26
1 job for master in 0 seconds (queued for 1 second)
latest
Name Stage Failure
failed
build_docker_image Build There has been a runner system failure, please try again
No job log