Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !79
2 jobs for develop in 3 minutes and 17 seconds (queued for 1 second)