Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !55
2 jobs for master in 2 minutes and 2 seconds