saltstack/salt — pull request #18827 by rallytime (2014-12-08 23:52:54+00:00)
Title: Backport #18332 to 2014.1

Backport #18332 to 2014.1