OSX: Update master branch with latest development state