Merge pull request #381 from darkgrin/server_addr_err

Fix error "Undefined index: SERVER_ADDR".
Merge remote-tracking branch 'upstream/master' into vim