Explicitly specify "&" as the argument separator.

Otherwise we risk constructing broken urls if something/someone has changed
arg_separator.output before this code is called (e.g., Dokuwiki).
Merge remote-tracking branch 'origin/master' into develop