Merge branch 'development' into 'master'

Development

See merge request !119
1 job for master in 2 minutes and 40 seconds (queued for 2 seconds)