saltstack/salt — pull request #18858 by rallytime (2014-12-09 21:20:16+00:00)
Title: Backport #18237 to 2014.1

Backport #18237 to 2014.1