Merge branch 'develop' into 'master'

Final release

See merge request !2
1 job for master in 0 seconds (queued for 9 seconds)