Merge branch 'feature/osx_bundle' into develop