Fixed a bug with unicode strings in the request builder.  This fixes #973
Fixed a broken testcase
Merge branch '0.9-maintenance'