server's name has been fixed (on client)
Merge remote-tracking branch 'origin/master'