Merge branch 'develop' into 'master'

Develop

See merge request !2
3 jobs for master in 1 minute and 28 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Check Style
passed #3229
docstyle

00:00:23

passed #3228
pep8

00:00:25

 
  Build
passed #3230
build_image

00:01:03