saltstack/salt — pull request #18347 by rallytime (2014-11-20 22:57:46+00:00)
Title: Backport #17706 to 2014.7

Backport #17706 to 2014.7