Move osx_focus to master