No need to handle stderr/stdout when cmdmod will do it for you
Merge pull request #18858 from rallytime/cp-18237

Backport #18237 to 2014.1