saltstack/salt — pull request #18892 by rallytime (2014-12-10 22:44:02+00:00)
Title: Backport #18213 to 2014.7

Backport #18213 to 2014.7