* Some minor handling changes to client connect to server actions.
Merge origin/master