Merge branch 'run_on_mac' into 'master'

Run on mac

See merge request !56
9 jobs for master
in 1 minute and 16 seconds and was queued for 6 seconds