Merge branch 'develop' into 'master'

Final version

See merge request !32
2 jobs for master in 2 minutes and 31 seconds (queued for 29 seconds)
Status Job ID Name Coverage
  Build
passed #119239
install_dependencies

00:01:24

 
  Test
passed #119240
testing_testing

00:01:06