Merge pull request #3195 from afedchin/win_vsync_def