saltstack/salt — pull request #19035 by rallytime (2014-12-16 23:12:07+00:00)
Title: Backport #19033 to 2014.1

Backport #19033 to 2014.1