Updated to the 1.5-SNAPSHOT version of the client that fixes a string encoding issue
Merge branch 'upstream'