Fix null string escape
Fix MSVC build
Remove "Server -!- " prefix from player messages
Merge remote-tracking branch 'upstream/master'
Fix merge conflict.