Fix OSX app/ub scripts
Fix typo preventing OSX native compiles
Merge remote-tracking branch 'upstream/master'