Merge branch 'hotfix/program-leonardo-fix' into develop
Merge branch 'master' into develop
Fixes in installer (forgotten ;; in case statement)