Handle 'Could not connect to the server' as offline
Merge branch 'master' into builds
7.638