Merge branch 'osx_updates' of https://github.com/slide/main into osx_updates