Fix server-side startup crash.
Merge remote-tracking branch 'origin/master'