saltstack/salt — pull request #19150 by rallytime (2014-12-19 23:20:39+00:00)
Title: Backport #19134 to 2014.7

Backport #19134 to 2014.7