Fix typo
Merge branch 'master' into rename_client