Merge branch 'Mac'

 Mac only specific changes.