Fix macs again
Merge branch 'master' into data_beta