quick merge fix on client.cpp
Merge branch 'master'