saltstack/salt — pull request #19226 by rallytime (2014-12-23 18:32:53+00:00)
Title: Backport #19121 to 2014.7

Backport #19121 to 2014.7