Typo
Don't simply wrap Exception in a ClientException without adding useful information
Merge branch 'master' into 5.6.0