Merge OSX branch into Master.