don't try to recover when the server closes the conneciton - cause it aint working at the moment - see branch 'reconnect'
Merge branch 'master' into prod