saltstack/salt — pull request #18817 by rallytime (2014-12-08 21:52:22+00:00)
Title: Backport #18220 to 2014.1

Backport #18220 to 2014.1