if query params are empty, then request path shouldn't end with a '?'
Merge pull request #462 from jaipandya/master

if query params are empty, then request path shouldn't end with a '?' (merges cleanly now)
Merge remote-tracking branch 'upstream/master'