FIXED checks not failing when server down
Merge remote-tracking branch 'upstream/master' into mh-sync-upstream