Update perf-test-client
Merge branch 'master' into gh-pages