Changed lost connection handling. Changed logging message.
Merge origin/master