Fixe a bug in the test client causing url parameters to be removed.  This fixes #968
Merge branch '0.10-maintenance'