Why lock up /connect if the master-server is down?
Merge branch 'sanity'