Merge bug-fix for peformance issue with PlusRemote.

Ghost Userrequested to merge
github/fork/tokjun/3813-fix-state-transitions-while-watiting-for-connection into master

This will fix the issue posted in: http://na-mic.org/Mantis/view.php?id=3813

Merge request reports