saltstack/salt — pull request #18349 by rallytime (2014-11-20 23:04:39+00:00)
Title: Backport #18049 to 2014.7

Backport #18049 to 2014.7