Merge branch 'dev' into 'master'

Version 1.1.1

See merge request !2
5 jobs for master in 2 minutes and 46 seconds