Merge branch 'develop' into 'master'

develop into master

See merge request !7
1 job for master in 15 minutes and 6 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #4685
build_image

00:15:06