Merge pull request #4463 from jmarshallnz/osx_vsync_always

[osx] vsync should default to always