Merge _s commit[348886e]

see.
https://github.com/Automattic/_s/commit/348886e168f894cfb9e15b0e02b0c67876b6a667

Comment correction: "setup" is a noun, "set up" is the action.