Comment correction: "setup" is a noun, "set up" is the action.
Merge remote-tracking branch 'upstream/master' into ja

* upstream/master:
  Comment correction: "setup" is a noun, "set up" is the action.