Another attempt to correctly handle lost connections.
Merge branch 'master' of github.com:thaljef/Pinto