Merge branch 'dev' into 'master'

Dev

See merge request !114
4 jobs for dev
in 4 minutes and 7 seconds and was queued for 6 seconds