saltstack/salt — pull request #18922 by rallytime (2014-12-11 19:34:34+00:00)
Title: Backport #18300 to 2014.1

Backport #18300 to 2014.1