Merge branch 'mac' into linux