Merge "Make parameter list generation consistent using urlencode()."