saltstack/salt — pull request #18774 by rallytime (2014-12-05 22:35:56+00:00)
Title: Backport #18150 to 2014.1

Backport #18150 to 2014.1