Merge branch 'master' into ticket648
handle the case of disconnected servers