Merge remote-tracking branch 'zonique/osx'