Fix the disconnect after 8 hours bug.
Merge branch 'hotfix/0.05a'