Merge remote branch 'keithp/macos'