saltstack/salt — pull request #18884 by rallytime (2014-12-10 17:29:06+00:00)
Title: Backport #18190 to 2014.1

Backport #18190 to 2014.1