Merge branch 'update_ci' into 'master'

CI: unbreak mac packaging

See merge request !413
21 jobs for master in 19 minutes and 2 seconds (queued for 10 seconds)