Fix pinging servers
Merge remote-tracking branch 'antox/master'