Merge branch 'develop' into 'master'

Develop

See merge request !78
2 jobs for master in 32 seconds (queued for 2 seconds)