saltstack/salt — pull request #18872 by rallytime (2014-12-10 00:09:03+00:00)
Title: Backport #18272 to 2014.1

Backport #18272 to 2014.1