oo server startup fix
Merge remote-tracking branch 'yarg.github/master' into github