Merge remote branch 'zonque/topic/osx'