Increase delay for Mac DMG build to try & avoid busy on eject
Switch to Oracle appbundler for Mac build
Merge remote-tracking branch 'upstream/master'
Switch to appbundler & specify target Java version on build
Run headless on Mac to work around Java Virtualbox crash
Quote problematic characters in help text - fixes #463