saltstack/salt — pull request #18378 by rallytime (2014-11-21 21:29:07+00:00)
Title: Backport #18079 to 2014.7

Backport #18079 to 2014.7