merge changes in client/ #579

buildbot:
 - [ ] http://lex1:8010/builders/driver_test-linux-c-opt/builds/219
 - [ ] http://lex1:8010/builders/nightly_test-linux-c-dbg/builds/90
 - [ ] http://lex1:8010/builders/nightly_test-linux-c-opt/builds/101