saltstack/salt — pull request #18927 by rallytime (2014-12-11 20:20:52+00:00)
Title: Backport #18174 to 2014.1

Backport #18174 to 2014.1

Plus fixed remaining `cmd_quote`.