OSX support
Merge branch 'darwin-support'