Fix strange crash upon joining dedicated server.
Merge remote-tracking branch 'origin/master'