Merge branch 'develop' into 'master'

Deployment

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