Merge in updates from ole-xbrowser
Fix error in bin/xrerun