saltstack/salt — pull request #19143 by rallytime (2014-12-19 21:08:03+00:00)
Title: Backport #19079 to 2014.7

Backport #19079 to 2014.7