Got the Mac App Bundler to work only on Macs.
Merge remote-tracking branch 'upstream/master'