Merge branch 'develop' into 'master'

Final release

See merge request !2
2 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 2 seconds