cmd.go: Use a Replacer instead of multiple calls to Replace.
Merge branch 'master' into cgi