Don't append / when appending querystring params.
Merge branch 'hotfix/2.11.7'